From 099bed915e10a49476ddebd0282154d341200c24 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 19:33:45 +0000
Subject: [PATCH] Sync from upstream repo

---
 Source/Editor/ClientSimEditorRuntimeLinker.cs |  28 +-
 .../Editors/ClientSimNetworkIdHolderEditor.cs |  72 ++
 .../ClientSimNetworkIdHolderEditor.cs.meta    |   3 +
 .../Resources/ClientSimPlayerDataWindow.uss   | 304 ++++++
 .../ClientSimPlayerDataWindow.uss.meta        |  11 +
 .../Resources/ClientSimPlayerDataWindow.uxml  |  31 +
 .../ClientSimPlayerDataWindow.uxml.meta       |  10 +
 .../Resources/ClientSimPlayerObjectWindow.uss |  84 ++
 .../ClientSimPlayerObjectWindow.uss.meta      |  11 +
 .../ClientSimPlayerObjectWindow.uxml          |  19 +
 .../ClientSimPlayerObjectWindow.uxml.meta     |   3 +
 Source/Editor/Resources/Icons.meta            |  14 +
 Source/Editor/Resources/Icons/FolderOpen.png  |   3 +
 .../Resources/Icons/FolderOpen.png.meta       | 140 +++
 Source/Editor/Resources/Icons/Log.png         |   3 +
 Source/Editor/Resources/Icons/Log.png.meta    | 140 +++
 Source/Editor/Resources/Icons/Trash.png       |   3 +
 Source/Editor/Resources/Icons/Trash.png.meta  | 140 +++
 Source/Editor/Resources/Icons/arrow.png       |   3 +
 Source/Editor/Resources/Icons/arrow.png.meta  | 140 +++
 Source/Editor/Resources/Icons/refresh.png     |   3 +
 .../Editor/Resources/Icons/refresh.png.meta   | 140 +++
 Source/Editor/VisualElements.meta             |   3 +
 .../ClientSimNetworkHolderInstanceElement.cs  | 108 ++
 ...entSimNetworkHolderInstanceElement.cs.meta |   3 +
 .../VisualElements/EncodeDecodeEditors.meta   |   3 +
 .../ClientSimObjectPoolEncodeDecodeEditor.cs  |  33 +
 ...entSimObjectPoolEncodeDecodeEditor.cs.meta |   3 +
 .../ClientSimObjectSyncEncodeDecodeEditor.cs  | 140 +++
 ...entSimObjectSyncEncodeDecodeEditor.cs.meta |   3 +
 .../ClientSimUdonEncodeDecodeEditor.cs        | 121 +++
 .../ClientSimUdonEncodeDecodeEditor.cs.meta   |   3 +
 .../IClientSimEncodeDecoderEditor.cs          |  13 +
 .../IClientSimEncodeDecoderEditor.cs.meta     |   3 +
 Source/Editor/VisualElements/Fields.meta      |   3 +
 .../Editor/VisualElements/Fields/ByteField.cs | 150 +++
 .../VisualElements/Fields/ByteField.cs.meta   |   3 +
 .../ClientSimNumericFieldDraggerUtility.cs    |  40 +
 ...lientSimNumericFieldDraggerUtility.cs.meta |   3 +
 .../Fields/ClientSimUINumericFieldsUtils.cs   | 110 ++
 .../ClientSimUINumericFieldsUtils.cs.meta     |   3 +
 .../VisualElements/Fields/FieldFactory.cs     | 177 ++++
 .../Fields/FieldFactory.cs.meta               |   3 +
 .../VisualElements/Fields/SbyteField.cs       | 150 +++
 .../VisualElements/Fields/SbyteField.cs.meta  |  11 +
 .../VisualElements/Fields/ShortField.cs       | 150 +++
 .../VisualElements/Fields/ShortField.cs.meta  |   3 +
 .../Editor/VisualElements/Fields/UIntField.cs | 150 +++
 .../VisualElements/Fields/UIntField.cs.meta   |   3 +
 .../VisualElements/Fields/ULongField.cs       | 150 +++
 .../VisualElements/Fields/ULongField.cs.meta  |   3 +
 .../VisualElements/Fields/UShortField.cs      | 150 +++
 .../VisualElements/Fields/UShortField.cs.meta |   3 +
 .../Windows/ClientSimPlayerDataWindow.cs      | 966 ++++++++++++++++++
 .../Windows/ClientSimPlayerDataWindow.cs.meta |   3 +
 .../Windows/ClientSimPlayerObjectWindow.cs    | 319 ++++++
 .../ClientSimPlayerObjectWindow.cs.meta       |   3 +
 .../Editor/Windows/ClientSimSettingsWindow.cs |  20 +-
 Source/README.md                              |  61 --
 Source/Runtime/ClientSimRuntimeLoader.cs      |   4 +
 .../EventTypes/ClientSimOnPlayerEvents.cs     |  51 +-
 .../ClientSimPositionSyncedHelperBase.cs      |   1 -
 Source/Runtime/Networking.meta                |   3 +
 .../ClientSimNetworkEventSending.cs           |  85 ++
 .../ClientSimNetworkEventSending.cs.meta      |   3 +
 .../Networking/ClientSimNetworkIdHolder.cs    | 204 ++++
 .../ClientSimNetworkIdHolder.cs.meta          |   3 +
 .../ClientSimNetworkingUtilities.cs           | 438 ++++++++
 .../ClientSimNetworkingUtilities.cs.meta      |   3 +
 .../Networking/ClientSimNetworkingView.cs     |  99 ++
 .../ClientSimNetworkingView.cs.meta           |   3 +
 Source/Runtime/Networking/EncodeDecoders.meta |   3 +
 .../ClientSimObjectPoolEncodeDecode.cs        |  90 ++
 .../ClientSimObjectPoolEncodeDecode.cs.meta   |   3 +
 .../ClientSimObjectSyncEncodeDecoder.cs       | 170 +++
 .../ClientSimObjectSyncEncodeDecoder.cs.meta  |   3 +
 .../ClientSimUdonEncodeDecode.cs              | 223 ++++
 .../ClientSimUdonEncodeDecode.cs.meta         |   3 +
 Source/Runtime/Networking/Interfaces.meta     |   3 +
 .../Interfaces/IClientSimEncodeDecoder.cs     |  24 +
 .../IClientSimEncodeDecoder.cs.meta           |   3 +
 .../Interfaces/IClientSimNetworkId.cs         |  12 +
 .../Interfaces/IClientSimNetworkId.cs.meta    |   3 +
 .../Interfaces/IClientSimNetworkSerializer.cs |  21 +
 .../IClientSimNetworkSerializer.cs.meta       |   3 +
 .../Interfaces/IClientSimNetworkView.cs       |  13 +
 .../Interfaces/IClientSimNetworkView.cs.meta  |   3 +
 Source/Runtime/Player/ClientSimPlayer.cs      | 311 +++++-
 .../Player/ClientSimPlayerController.cs       |  12 +-
 .../PlayerData/ClientSimPlayerAudioData.cs    |  36 +-
 Source/Runtime/Player/PlayerPersistence.meta  |   3 +
 .../ClientSimPlayerDataConverter.cs           | 406 ++++++++
 .../ClientSimPlayerDataConverter.cs.meta      |   3 +
 .../ClientSimPlayerDataPair.cs                |  20 +
 .../ClientSimPlayerDataPair.cs.meta           |   3 +
 .../ClientSimPlayerDataStorage.cs             | 864 ++++++++++++++++
 .../ClientSimPlayerDataStorage.cs.meta        |   3 +
 .../ClientSimPlayerDataType.cs                |  28 +
 .../ClientSimPlayerDataType.cs.meta           |   3 +
 .../ClientSimPlayerDataTypeUnion.cs           |  39 +
 .../ClientSimPlayerDataTypeUnion.cs.meta      |   3 +
 .../ClientSimPlayerDataWrapper.cs             | 469 +++++++++
 .../ClientSimPlayerDataWrapper.cs.meta        |   3 +
 .../ClientSimPlayerObjectStorage.cs           | 180 ++++
 .../ClientSimPlayerObjectStorage.cs.meta      |   3 +
 .../Materials/Avatar_Utility_Base_MAT.mat     |  19 +-
 .../Materials/Avatar_Utility_Body_MAT.mat     |  19 +-
 .../Prefabs/ClientSimPlayerData.prefab        |  59 ++
 .../Prefabs/ClientSimPlayerData.prefab.meta}  |   4 +-
 .../Prefabs/ClientSimPlayerLocal.prefab       |  94 +-
 .../Prefabs/ClientSimPlayerRemote.prefab      |  48 +-
 .../Runtime/Stubs/ClientSimAVProVideoStub.cs  |   6 +
 Source/Runtime/Stubs/UdonProductStub.cs       |  15 +-
 .../ClientSimInteractiveLayerProvider.cs      |   9 +-
 Source/Runtime/System/ClientSimMain.cs        | 170 ++-
 .../System/ClientSimPlayerHeightManager.cs    |   5 +-
 .../Runtime/System/ClientSimPlayerManager.cs  |  95 +-
 .../Runtime/System/ClientSimPlayerSpawner.cs  |   9 +
 .../System/ClientSimStoreManager.cs.meta      |   3 +
 .../System/ClientSimSyncedObjectManager.cs    |  34 +-
 Source/Runtime/System/ClientSimUdonManager.cs |  39 +-
 .../Interfaces/IClientSimPlayerManager.cs     |   1 +
 .../IClientSimSyncedObjectManager.cs          |   7 +-
 Source/Runtime/VRC.ClientSim.asmdef           |   4 +-
 Source/package.json                           |  34 -
 Source/package.json.meta                      |   7 -
 126 files changed, 8677 insertions(+), 248 deletions(-)
 create mode 100644 Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs
 create mode 100644 Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs.meta
 create mode 100644 Source/Editor/Resources/ClientSimPlayerDataWindow.uss
 create mode 100644 Source/Editor/Resources/ClientSimPlayerDataWindow.uss.meta
 create mode 100644 Source/Editor/Resources/ClientSimPlayerDataWindow.uxml
 create mode 100644 Source/Editor/Resources/ClientSimPlayerDataWindow.uxml.meta
 create mode 100644 Source/Editor/Resources/ClientSimPlayerObjectWindow.uss
 create mode 100644 Source/Editor/Resources/ClientSimPlayerObjectWindow.uss.meta
 create mode 100644 Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml
 create mode 100644 Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml.meta
 create mode 100644 Source/Editor/Resources/Icons.meta
 create mode 100644 Source/Editor/Resources/Icons/FolderOpen.png
 create mode 100644 Source/Editor/Resources/Icons/FolderOpen.png.meta
 create mode 100644 Source/Editor/Resources/Icons/Log.png
 create mode 100644 Source/Editor/Resources/Icons/Log.png.meta
 create mode 100644 Source/Editor/Resources/Icons/Trash.png
 create mode 100644 Source/Editor/Resources/Icons/Trash.png.meta
 create mode 100644 Source/Editor/Resources/Icons/arrow.png
 create mode 100644 Source/Editor/Resources/Icons/arrow.png.meta
 create mode 100644 Source/Editor/Resources/Icons/refresh.png
 create mode 100644 Source/Editor/Resources/Icons/refresh.png.meta
 create mode 100644 Source/Editor/VisualElements.meta
 create mode 100644 Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs
 create mode 100644 Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs.meta
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors.meta
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs.meta
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs.meta
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs.meta
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs
 create mode 100644 Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields.meta
 create mode 100644 Source/Editor/VisualElements/Fields/ByteField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/ByteField.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs
 create mode 100644 Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs
 create mode 100644 Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/FieldFactory.cs
 create mode 100644 Source/Editor/VisualElements/Fields/FieldFactory.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/SbyteField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/SbyteField.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/ShortField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/ShortField.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/UIntField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/UIntField.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/ULongField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/ULongField.cs.meta
 create mode 100644 Source/Editor/VisualElements/Fields/UShortField.cs
 create mode 100644 Source/Editor/VisualElements/Fields/UShortField.cs.meta
 create mode 100644 Source/Editor/Windows/ClientSimPlayerDataWindow.cs
 create mode 100644 Source/Editor/Windows/ClientSimPlayerDataWindow.cs.meta
 create mode 100644 Source/Editor/Windows/ClientSimPlayerObjectWindow.cs
 create mode 100644 Source/Editor/Windows/ClientSimPlayerObjectWindow.cs.meta
 delete mode 100644 Source/README.md
 create mode 100644 Source/Runtime/Networking.meta
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkEventSending.cs
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkEventSending.cs.meta
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkIdHolder.cs
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkIdHolder.cs.meta
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkingUtilities.cs
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkingUtilities.cs.meta
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkingView.cs
 create mode 100644 Source/Runtime/Networking/ClientSimNetworkingView.cs.meta
 create mode 100644 Source/Runtime/Networking/EncodeDecoders.meta
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs.meta
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs.meta
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs
 create mode 100644 Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs.meta
 create mode 100644 Source/Runtime/Networking/Interfaces.meta
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs.meta
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs.meta
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs.meta
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs
 create mode 100644 Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs.meta
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs
 create mode 100644 Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs.meta
 create mode 100644 Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab
 rename Source/{README.md.meta => Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab.meta} (62%)
 create mode 100644 Source/Runtime/System/ClientSimStoreManager.cs.meta
 delete mode 100644 Source/package.json
 delete mode 100644 Source/package.json.meta

diff --git a/Source/Editor/ClientSimEditorRuntimeLinker.cs b/Source/Editor/ClientSimEditorRuntimeLinker.cs
index c6a5b04..27999c8 100644
--- a/Source/Editor/ClientSimEditorRuntimeLinker.cs
+++ b/Source/Editor/ClientSimEditorRuntimeLinker.cs
@@ -1,5 +1,6 @@
 using UnityEditor;
 using UnityEngine;
+using VRC.SDKBase;
 
 namespace VRC.SDK3.ClientSim.Editor
 {
@@ -12,25 +13,38 @@ public static class ClientSimEditorRuntimeLinker
     {
         private static void ModeStateChanged(PlayModeStateChange state)
         {
+            
+            if(state == PlayModeStateChange.EnteredPlayMode)
+            {
+                ClientSimMenu.openSettingsHook += ClientSimSettingsWindow.Init;
+                ClientSimMenu.checkValidSettingsHook += ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
+            }
+            
             // On exiting playmode, remove the Editor method hooks.
             if (state == PlayModeStateChange.ExitingPlayMode)
             {
                 ClientSimMenu.openSettingsHook -= ClientSimSettingsWindow.Init;
                 ClientSimMenu.checkValidSettingsHook -= ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
-                
-                EditorApplication.playModeStateChanged -= ModeStateChanged;
+            }
+
+            if (state == PlayModeStateChange.ExitingEditMode)
+            {
+                InitializeScene();
             }
         }
 
         // When entering playmode, set Editor method hooks.
         // Using this runtime initialized method due to timing issues with with Domain Reloading on and off.
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-        private static void OnPlaymodeStart()
+        [InitializeOnLoadMethod]
+        private static void OnProjectLoadedInEditor()
         {
-            ClientSimMenu.openSettingsHook += ClientSimSettingsWindow.Init;
-            ClientSimMenu.checkValidSettingsHook += ClientSimProjectSettingsSetup.IsUsingCorrectSettings;
-            
             EditorApplication.playModeStateChanged += ModeStateChanged;
         }
+        
+        
+        private static void InitializeScene()
+        {
+            ClientSimNetworkingUtilities.DoSceneSetup();
+        }
     }
 }
\ No newline at end of file
diff --git a/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs b/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs
new file mode 100644
index 0000000..bfe1db5
--- /dev/null
+++ b/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs
@@ -0,0 +1,72 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements;
+
+namespace VRC.SDK3.ClientSim.Editor
+{
+    #if VRC_ENABLE_PLAYER_PERSISTENCE
+    [UnityEditor.CustomEditor(typeof(ClientSimNetworkIdHolder))]
+    public class ClientSimNetworkIdHolderEditor : UnityEditor.Editor
+    {
+        private VisualElement _List;
+        private IClientSimEventDispatcher _eventDispatcher;
+
+        public void OnEnable()
+        {
+            _eventDispatcher = ClientSimMain.GetInstance().GetEventDispatcher();
+            _eventDispatcher.Subscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+        }
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            VisualElement root = new VisualElement();
+            ClientSimNetworkIdHolder networkIdHolder = (ClientSimNetworkIdHolder) target;
+            
+            if (networkIdHolder._components != null)
+            {
+                root.Add(new Label("Network Id: " + networkIdHolder._networkId.GetNetworkId()));
+                root.Add(new Label("Network Components"));
+                _List = new VisualElement();
+                for (int i = 0; i < networkIdHolder._components.Count; i++)
+                {
+                    if (ClientSimNetworkHolderInstanceElement.encodeDecoders.TryGetValue(networkIdHolder._components[i].GetType().FullName, out var encodeDecoder))
+                    {
+                        MonoBehaviour component = networkIdHolder._components[i];
+                        if(networkIdHolder._data.Count > i)
+                            _List.Add(encodeDecoder.GenerateFields(component,networkIdHolder._data[i].DataDictionary));
+                    }
+                }
+                root.Add(_List);
+            }
+            
+            return root;
+        }
+        
+        private void OnPlayerObjectUpdated(ClientSimOnPlayerObjectUpdatedEvent e)
+        {
+            ClientSimNetworkIdHolder networkIdHolder = (ClientSimNetworkIdHolder) target;
+            if ((ClientSimNetworkIdHolder)e.Data != networkIdHolder) return;
+            
+            if (networkIdHolder._components != null)
+            {
+                for (int i = 0; i < networkIdHolder._components.Count; i++)
+                {
+                    if (ClientSimNetworkHolderInstanceElement.encodeDecoders.TryGetValue(networkIdHolder._components[i].GetType().FullName, out var encodeDecoder))
+                    {
+                        MonoBehaviour component = networkIdHolder._components[i];
+                        if(networkIdHolder._data.Count > i)
+                            encodeDecoder.UpdateFields(component,_List[i],networkIdHolder._data[i].DataDictionary);
+                    }
+                }
+            }
+        }
+        
+        public void OnDisable()
+        {
+            _eventDispatcher?.Unsubscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+        }
+    }
+#endif
+}
\ No newline at end of file
diff --git a/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs.meta b/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs.meta
new file mode 100644
index 0000000..58be880
--- /dev/null
+++ b/Source/Editor/Editors/ClientSimNetworkIdHolderEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce7f02c154a942e6b63d5e78ae579eac
+timeCreated: 1716481811
\ No newline at end of file
diff --git a/Source/Editor/Resources/ClientSimPlayerDataWindow.uss b/Source/Editor/Resources/ClientSimPlayerDataWindow.uss
new file mode 100644
index 0000000..a8c42ec
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerDataWindow.uss
@@ -0,0 +1,304 @@
+.content {
+    margin: 5px;
+}
+
+.menu-buttons {
+    align-items: flex-start;
+    justify-content: flex-start;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-self: auto;
+    position: relative;
+    top: auto;
+    left: auto;
+    width: 150px;
+    height: 40px;
+    padding-left: 0;
+    padding-top: 0;
+    margin-bottom: 2.5px;
+    margin-left: 0;
+}
+
+.menu-button {
+    height: 34px;
+    width: 50px;
+    margin: 0;
+}
+
+.menu-button-open {
+    background-image: resource('Icons/FolderOpen');
+    -unity-background-scale-mode: scale-to-fit;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    background-color: rgba(0, 0, 0, 0);
+    scale: 0.75 0.75;
+    width: auto;
+    height: 30px;
+}
+
+.menu-button-refresh {
+    background-image: resource('Icons/Refresh');
+    -unity-background-scale-mode: scale-to-fit;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    background-color: rgba(0, 0, 0, 0);
+    scale: 0.75 0.75;
+    width: auto;
+    height: 30px;
+    align-items: auto;
+    flex-direction: column;
+    display: flex;
+}
+
+.menu-button-clear {
+    background-image: resource('Icons/Trash');
+    padding: 0;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    scale: 0.5 0.5;
+    background-color: rgba(0, 0, 0, 0);
+    height: 30px;
+    -unity-background-scale-mode: scale-to-fit;
+}
+
+.menu-button-left {
+    border-radius: 7px 0 0 7px;
+}
+
+.menu-button-right {
+    border-radius: 0 7px 7px 0;
+}
+
+.menu-button-center {
+    border-radius: 0 0 0 0;
+}
+
+.dropdown {
+    flex-direction: column;
+    flex-wrap: nowrap;
+    align-items: auto;
+    justify-content: flex-start;
+}
+
+.dropdown-player {
+    align-items: auto;
+    align-self: auto;
+    justify-content: flex-start;
+    width: 150px;
+    flex-direction: column;
+    margin-right: 0;
+    min-height: auto;
+    min-width: auto;
+    display: flex;
+    visibility: visible;
+    overflow: visible;
+    opacity: 1;
+    flex-wrap: nowrap;
+    margin-left: 0;
+    position: relative;
+    top: auto;
+    left: auto;
+    background-color: rgba(255, 255, 255, 0);
+    margin-top: 0;
+    height: 20px;
+}
+
+.dropdown-sort {
+    align-items: flex-start;
+    align-self: auto;
+    justify-content: flex-start;
+    width: 150px;
+    flex-direction: row;
+    margin-right: 0;
+    min-height: auto;
+    min-width: auto;
+    display: none;
+    visibility: visible;
+    overflow: visible;
+    opacity: 1;
+    flex-wrap: nowrap;
+    margin-left: 0;
+    position: relative;
+    top: auto;
+    left: auto;
+    background-color: rgba(255, 255, 255, 0);
+    margin-top: 0;
+    height: 30px;
+    padding-top: 10px;
+}
+
+.data-header {
+    flex-direction: row;
+    margin-right: 0;
+}
+
+.randomize-button {
+    margin: 0;
+    padding: 0;
+    width: 150px;
+    height: 30px;
+    display: none;
+}
+
+.info-text {
+    align-items: auto;
+    display: flex;
+    background-color: rgba(0, 0, 0, 0);
+    -unity-background-image-tint-color: rgb(0, 0, 0);
+    -unity-background-scale-mode: stretch-to-fill;
+    margin-left: 0;
+    padding-left: 0;
+    color: rgb(173, 173, 173);
+    font-size: 12px;
+    margin-top: 0;
+    justify-content: flex-start;
+    align-self: auto;
+    flex-direction: column;
+    left: -8px;
+    top: 1px;
+}
+
+.info-icon {
+    flex-grow: 1;
+    width: 50px;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    align-items: auto;
+    justify-content: flex-start;
+    align-self: auto;
+    max-width: 50px;
+    -unity-background-scale-mode: scale-to-fit;
+    background-image: resource('Icons/Log');
+    scale: 0.8 0.8;
+}
+
+.info {
+    flex-grow: 1;
+    flex-direction: row;
+    height: 50px;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    flex-wrap: nowrap;
+    align-items: stretch;
+    justify-content: flex-start;
+    align-self: auto;
+    width: 320px;
+    border-left-color: rgb(0, 0, 0);
+    border-right-color: rgb(0, 0, 0);
+    border-top-color: rgb(0, 0, 0);
+    border-bottom-color: rgb(0, 0, 0);
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-radius: 5px;
+    padding-top: 0;
+    margin-top: 5px;
+    background-color: rgb(64, 64, 64);
+    -unity-background-scale-mode: scale-to-fit;
+}
+
+.unity-label {
+    padding-left: 100px;
+    margin-left: -100px;
+}
+
+.unity-base-field {
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-bottom: 4px;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    margin-left: 0;
+    padding-top: 0;
+    height: auto;
+}
+
+.unity-base-field .unity-base-field {
+    padding-bottom: 0;
+}
+
+.unity-composite-field {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: auto;
+    justify-content: flex-start;
+    align-self: stretch;
+}
+
+.unity-composite-field__field-spacer {
+    display: none;
+}
+
+.scroll-view {
+    height: auto;
+    justify-content: flex-start;
+    min-height: auto;
+    margin: 0;
+    padding: 10px;
+}
+
+.scroll-view .unity-label {
+    -unity-background-scale-mode: stretch-to-fill;
+    left: auto;
+    position: relative;
+    width: 250px;
+}
+
+.paging {
+    flex-grow: 1;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: flex-end;
+    align-self: auto;
+    border-right-width: 0;
+    border-left-width: 0;
+    border-top-width: 0;
+    border-bottom-width: 0;
+    margin-right: 0;
+}
+
+.paging .unity-label {
+    width: auto;
+    height: auto;
+    align-items: auto;
+    justify-content: flex-start;
+    align-self: auto;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    margin: 0;
+    padding: 0;
+}
+
+.paging-next {
+    background-image: resource('Icons/Arrow');
+    background-color: rgb(88, 88, 88);
+    rotate: -90deg;
+    -unity-background-scale-mode: scale-to-fit;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    width: 40px;
+    height: 30px;
+    scale: 0.5 0.75;
+}
+
+.paging-previous {
+    background-color: rgb(88, 88, 88);
+    background-image: resource('Icons/Arrow');
+    -unity-background-scale-mode: scale-to-fit;
+    rotate: 90deg;
+    width: 40px;
+    height: 30px;
+    scale: 0.5 0.75;
+    padding: 0;
+    margin: 0;
+}
+
+.unity-composite-field__field .unity-label {
+    width: 20px;
+    min-width: 20px;
+    max-width: 20px;
+    -unity-text-align: middle-center;
+    margin: 0;
+    padding: 0;
+}
+
+
diff --git a/Source/Editor/Resources/ClientSimPlayerDataWindow.uss.meta b/Source/Editor/Resources/ClientSimPlayerDataWindow.uss.meta
new file mode 100644
index 0000000..89c41e4
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerDataWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dd10e9a97cf7d424bb40e1f5898c19c6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml b/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml
new file mode 100644
index 0000000..088805a
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml
@@ -0,0 +1,31 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="project://database/Packages/com.vrchat.worlds/Integrations/ClientSim/Editor/Resources/ClientSimPlayerDataWindow.uss?fileID=7433441132597879392&amp;guid=dd10e9a97cf7d424bb40e1f5898c19c6&amp;type=3#ClientSimPlayerDataWindow" />
+    <ui:VisualElement name="Content" class="content">
+        <ui:VisualElement name="MenuButtons" class="menu-buttons">
+            <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="OpenDataFolderButton" tooltip="Open folder containing the ClientSim PlayerData" class="menu-button menu-button-left">
+                <ui:VisualElement name="OpenFolderIcon" class="menu-button-open" />
+            </ui:Button>
+            <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="RefreshDataButton" tooltip="Refresh data - Use this after you&apos;ve edited a PlayerData JSON file" class="menu-button menu-button-center">
+                <ui:VisualElement name="RefreshIcon" class="menu-button-refresh" />
+            </ui:Button>
+            <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="ClearDataButton" tooltip="Delete all ClientSim PlayerData" usage-hints="None" class="menu-button menu-button-right">
+                <ui:VisualElement name="ClearIcon" class="menu-button-clear" />
+            </ui:Button>
+        </ui:VisualElement>
+        <ui:DropdownField index="0" choices="[1] Local Player" name="PlayerDropdown" tooltip="In Edit Mode, the local player is the only option. In Play Mode, entries for any remote players that have been spawned will appear here." class="dropdown-player dropdown" />
+        <ui:VisualElement name="NoDataInfo" class="info">
+            <ui:VisualElement name="InfoIcon" class="info-icon" />
+            <ui:Label tabindex="-1" text="PlayerData for the selected player is empty." parse-escape-sequences="true" display-tooltip-when-elided="true" name="InfoText" class="info-text" />
+        </ui:VisualElement>
+        <ui:VisualElement name="DataHeader" class="data-header">
+            <ui:DropdownField index="0" choices="Alphabetically,Last Updated,First Added" name="SortDropdown" label="Sort by" tooltip="Sort ClientSim PlayerData" class="dropdown-sort" />
+            <ui:VisualElement name="Paging" class="paging">
+                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="PreviousPageButton" class="paging-previous" />
+                <ui:Label tabindex="-1" text="1 / 1" parse-escape-sequences="true" display-tooltip-when-elided="true" name="PageLabel" />
+                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="NextPageButton" class="paging-next" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+        <ui:Button text="Randomize Data" parse-escape-sequences="true" display-tooltip-when-elided="true" name="RandomizeButton" tooltip="Generate random PlayerData for the selected remote player based on the local player&apos;s PlayerData schema" class="randomize-button" />
+        <ui:ScrollView name="PlayerDataList" mode="Vertical" class="scroll-view" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml.meta b/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml.meta
new file mode 100644
index 0000000..a4abcca
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerDataWindow.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4608c965813f48448be4a84ca4c801ce
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss
new file mode 100644
index 0000000..b92c6f1
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss
@@ -0,0 +1,84 @@
+.header {
+    position: relative;
+    visibility: visible;
+    display: flex;
+    overflow: visible;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-bottom: 5px;
+    margin-top: 10px;
+    margin-left: 5px;
+    flex-shrink: 0;
+}
+
+.searchAndSort {
+    width: 100%;
+    flex-direction: row;
+}
+
+.search {
+    flex-grow: 1;
+    min-width: 100px;
+}
+
+.sort {
+    flex-grow: 1;
+    min-width: auto;
+}
+
+.scroll-view {
+    margin: 0;
+    padding: 10px;
+    flex-grow: 1;
+    padding-left: 0;
+    padding-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+.helptext {
+    align-items: stretch;
+    -unity-text-align: middle-center;
+    font-size: 15px;
+    flex-grow: 1;
+    flex-wrap: wrap;
+    white-space: normal;
+}
+
+.helpTextbox {
+    height: auto;
+    border-top-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+    border-left-color: rgb(0, 0, 0);
+    border-right-color: rgb(0, 0, 0);
+    border-top-color: rgb(0, 0, 0);
+    border-bottom-color: rgb(0, 0, 0);
+    flex-grow: 0;
+    margin-top: 5px;
+    margin-right: 5px;
+    margin-bottom: 5px;
+    margin-left: 5px;
+    background-color: rgb(81, 81, 81);
+    flex-wrap: wrap;
+    min-height: 40px;
+}
+
+.paging {
+    justify-content: center;
+    flex-shrink: 0;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+ClientSimNetworkHolderInstanceElement Button {
+    padding-left: 6px;
+    padding-bottom: 2px;
+    width: 16px;
+    height: 16px;
+}
diff --git a/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss.meta b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss.meta
new file mode 100644
index 0000000..c3bf3f9
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f2b1e23097f00540a7705261726f8e9
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml
new file mode 100644
index 0000000..373e1ac
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml
@@ -0,0 +1,19 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <Style src="project://database/Packages/com.vrchat.worlds/Integrations/ClientSim/Editor/Resources/ClientSimPlayerObjectWindow.uss?fileID=7433441132597879392&amp;guid=7f2b1e23097f00540a7705261726f8e9&amp;type=3#ClientSimPlayerObjectWindow" />
+    <ui:VisualElement name="Header" class="header">
+        <ui:VisualElement name="SearchAndSort" class="searchAndSort">
+            <ui:TextField picking-mode="Ignore" name="Search" keyboard-type="Search" class="search" />
+            <ui:DropdownField label="Sort by" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="Sort" class="sort" />
+        </ui:VisualElement>
+        <ui:DropdownField name="PlayerDropdown" class="dropdown" />
+    </ui:VisualElement>
+    <ui:ScrollView name="PlayerObjectList" mode="Vertical" class="scroll-view" style="overflow: hidden; display: flex; visibility: visible;" />
+    <ui:VisualElement name="HelpTextBox" class="helpTextbox">
+        <ui:Label tabindex="-1" text="Enter Play Mode to view PlayerObjects" parse-escape-sequences="true" display-tooltip-when-elided="true" name="HelpTextBoxLabel" class="helptext" />
+    </ui:VisualElement>
+    <ui:VisualElement name="Paging" class="paging" style="flex-direction: row;">
+        <ui:Button text="&lt;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Left" />
+        <ui:Label tabindex="-1" text="0/5" parse-escape-sequences="true" display-tooltip-when-elided="true" name="PagingLabel" />
+        <ui:Button text="&gt;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Right" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml.meta b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml.meta
new file mode 100644
index 0000000..972cf0d
--- /dev/null
+++ b/Source/Editor/Resources/ClientSimPlayerObjectWindow.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b2d01571760c4a2986a424f626d5bfef
+timeCreated: 1715610035
\ No newline at end of file
diff --git a/Source/Editor/Resources/Icons.meta b/Source/Editor/Resources/Icons.meta
new file mode 100644
index 0000000..ae6e535
--- /dev/null
+++ b/Source/Editor/Resources/Icons.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:SdkStaging-VPM/Packages/com.vrchat.worlds/Integrations/ClientSim/Editor/Resources/Icons.meta
+guid: d4fe049ca08e18642b9c4e99d726517e
+|||||||| 59c708fea2b:Assets/Features/BifrostUI/Icons.meta
+guid: ac4616caad22f914b90dae1156f28e29
+========
+guid: 0db01d374bad60844ae3ac004610a0a4
+>>>>>>>> ca19f46b5b6d897fe23e0f1c411a64c4a706eb7f:Assets/Editor/ScriptMigration.meta
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/Resources/Icons/FolderOpen.png b/Source/Editor/Resources/Icons/FolderOpen.png
new file mode 100644
index 0000000..e1733b3
--- /dev/null
+++ b/Source/Editor/Resources/Icons/FolderOpen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:017d7d1c3e44182f0174f3aab4c3794903e5a22d7784642dc35f976a6eafbdc8
+size 350
diff --git a/Source/Editor/Resources/Icons/FolderOpen.png.meta b/Source/Editor/Resources/Icons/FolderOpen.png.meta
new file mode 100644
index 0000000..7fcedf3
--- /dev/null
+++ b/Source/Editor/Resources/Icons/FolderOpen.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: c8fd5f3786124da488b0afb915024290
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/Resources/Icons/Log.png b/Source/Editor/Resources/Icons/Log.png
new file mode 100644
index 0000000..0518362
--- /dev/null
+++ b/Source/Editor/Resources/Icons/Log.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2987199a7ff6e864083ba5feef0b80ad2cb601966b54dfb8cdc3277fb56f34b
+size 633
diff --git a/Source/Editor/Resources/Icons/Log.png.meta b/Source/Editor/Resources/Icons/Log.png.meta
new file mode 100644
index 0000000..9ac1e8f
--- /dev/null
+++ b/Source/Editor/Resources/Icons/Log.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: e64f6f7f406d52944a7c771560f32776
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/Resources/Icons/Trash.png b/Source/Editor/Resources/Icons/Trash.png
new file mode 100644
index 0000000..f9a218b
--- /dev/null
+++ b/Source/Editor/Resources/Icons/Trash.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9bc8100a9b7959314cd11595d93cdefae5bd7c47454cb597f7e005c3fc16d71
+size 189
diff --git a/Source/Editor/Resources/Icons/Trash.png.meta b/Source/Editor/Resources/Icons/Trash.png.meta
new file mode 100644
index 0000000..9b54560
--- /dev/null
+++ b/Source/Editor/Resources/Icons/Trash.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 5760aa0404414ba46a3ab17f0cf9a119
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 12
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/Resources/Icons/arrow.png b/Source/Editor/Resources/Icons/arrow.png
new file mode 100644
index 0000000..ef1a517
--- /dev/null
+++ b/Source/Editor/Resources/Icons/arrow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:231a482b46d1820a517f5d09835512140d8ddc5fd8b8de97a054c8582738ab06
+size 2842
diff --git a/Source/Editor/Resources/Icons/arrow.png.meta b/Source/Editor/Resources/Icons/arrow.png.meta
new file mode 100644
index 0000000..59ae9a3
--- /dev/null
+++ b/Source/Editor/Resources/Icons/arrow.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 6209135682e85d548aa7d8880d78f277
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/Resources/Icons/refresh.png b/Source/Editor/Resources/Icons/refresh.png
new file mode 100644
index 0000000..956d8c5
--- /dev/null
+++ b/Source/Editor/Resources/Icons/refresh.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7e11a011ecd262a02412c0e6949ea8ed568ef454050dacdf1930c85bbb06fb9
+size 567
diff --git a/Source/Editor/Resources/Icons/refresh.png.meta b/Source/Editor/Resources/Icons/refresh.png.meta
new file mode 100644
index 0000000..1933ace
--- /dev/null
+++ b/Source/Editor/Resources/Icons/refresh.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 73d1b9d7ead861c44ad39986ed8447af
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/VisualElements.meta b/Source/Editor/VisualElements.meta
new file mode 100644
index 0000000..2787ffc
--- /dev/null
+++ b/Source/Editor/VisualElements.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1a79ea3eada4487186d1fd69e1ead853
+timeCreated: 1715614704
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs b/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs
new file mode 100644
index 0000000..d0a7d0e
--- /dev/null
+++ b/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements.EncodeDecodeEditors;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Components;
+using VRC.SDK3.Data;
+using VRC.Udon;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements
+{
+    #if VRC_ENABLE_PLAYER_PERSISTENCE
+    public class ClientSimNetworkHolderInstanceElement : VisualElement
+    {
+        private GameObject _gameObject;
+        private string _componentName;
+        private string _componentType;
+        private MonoBehaviour _component;
+        
+        private Foldout foldout;
+
+        private IClientSimNetworkSerializer networkView;
+        
+        internal static Dictionary<string,IClientSimEncodeDecoderEditor> encodeDecoders = new Dictionary<string,IClientSimEncodeDecoderEditor>
+        {
+            { typeof(VRCObjectSync).FullName, new ClientSimObjectSyncEncodeDecodeEditor() },
+            { typeof(UdonBehaviour).FullName, new ClientSimUdonEncodeDecodeEditor() },
+            { typeof(VRCObjectPool).FullName, new ClientSimObjectPoolEncodeDecodeEditor()}
+        };
+        
+        private VisualElement _dataElements;
+
+
+        public ClientSimNetworkHolderInstanceElement()
+        {
+            foldout = new Foldout();
+            Button selectButton = new Button(() =>
+            {
+                Selection.activeObject = _gameObject;
+            });
+            
+            selectButton.text = ">";
+            
+            foldout.Q<Toggle>().Add(selectButton);
+            this.Add(foldout);
+        }
+        
+        private void GetDataFromComponent(int index)
+        {
+            _component = networkView.GetNetworkComponents()[index];
+            
+            _gameObject = _component.gameObject;
+            _componentType = _component.GetType().FullName;
+            
+            if (_component is UdonBehaviour)
+            {
+                _componentName = ((UdonBehaviour) _component).programSource.name;
+            }
+            else
+            {
+                _componentName = _component.GetType().Name;
+            }
+        }
+        
+        private void GenerateDataElements(int index)
+        {
+            if (encodeDecoders.TryGetValue(_componentType, out var encodeDecoder))
+            {
+                _dataElements = encodeDecoder.GenerateFields(_component, networkView.GetData()[index].DataDictionary);
+            }
+        }
+
+        public void UpdateData(ClientSimPlayerObjectWindow.PlayerObjectData data)
+        {
+            if (data.NetworkView != networkView)
+            {
+                foldout.Clear();
+                networkView = data.NetworkView;
+                GetDataFromComponent(data.index);
+                
+                this.name = $"{_componentName}({_gameObject.name})";
+                foldout.text = $"{_componentName}({_gameObject.name})";
+                GenerateDataElements(data.index);
+                foldout.Add(_dataElements);
+            }
+            
+            if (encodeDecoders.TryGetValue(_componentType, out var encodeDecoder))
+            {
+                if (_dataElements == null)
+                { 
+                    GenerateDataElements(data.index);
+                    foldout.Clear();
+                    foldout.Add(_dataElements);
+                }
+                else
+                {
+                    encodeDecoder.UpdateFields(_component, _dataElements, networkView.GetData()[data.index].DataDictionary);
+                }
+            }
+            
+            style.display = networkView.GetData().Count > 0 ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+    }
+#endif
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs.meta b/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs.meta
new file mode 100644
index 0000000..4b623cc
--- /dev/null
+++ b/Source/Editor/VisualElements/ClientSimNetworkHolderInstanceElement.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4f3e1ce223c6460aa9a05edbecf50b31
+timeCreated: 1715614752
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors.meta b/Source/Editor/VisualElements/EncodeDecodeEditors.meta
new file mode 100644
index 0000000..a07cdae
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5715f6d9033043f6a25678681d632679
+timeCreated: 1716478398
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs
new file mode 100644
index 0000000..b9de814
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs
@@ -0,0 +1,33 @@
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements.Fields;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.EncodeDecodeEditors
+{
+    public class ClientSimObjectPoolEncodeDecodeEditor : IClientSimEncodeDecoderEditor
+    {
+
+        public VisualElement GenerateFields(MonoBehaviour component, DataDictionary data)
+        {
+            VisualElement container = new VisualElement();
+            DataList values = (DataList) data["Values"];
+            for(int i = 0; i < (int)data["Length"].Double; i++)
+            {
+                container.Add(FieldFactory.GenerateField("Object " + i , values[i].Boolean));
+            }
+
+            return container;
+        }
+
+        public void UpdateFields(MonoBehaviour component, VisualElement dataElement, DataDictionary data)
+        {
+            DataList values = (DataList) data["Values"];
+            for(int i = 0; i < (int)data["Length"].Double; i++)
+            {
+                FieldFactory.UpdateField(dataElement[i], values[i].Boolean);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs.meta b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs.meta
new file mode 100644
index 0000000..65893ec
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectPoolEncodeDecodeEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9861710bbbed4136b87f8ecfb5500488
+timeCreated: 1716478455
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs
new file mode 100644
index 0000000..8f98fa6
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs
@@ -0,0 +1,140 @@
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements.Fields;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.EncodeDecodeEditors
+{
+    public class ClientSimObjectSyncEncodeDecodeEditor : IClientSimEncodeDecoderEditor
+    {
+        private const string Discontinuitycounter = "DiscontinuityCounter";
+        private const string Discontinuity = "Discontinuity";
+        private const string Heldinhand = "HeldInHand";
+        private const string Time = "Time";
+        private const string Wassleeping = "WasSleeping";
+        private const string Usegravity = "UseGravity";
+        private const string Iskinematic = "IsKinematic";
+        private const string Velocity = "Velocity";
+        private const string Rotation = "Rotation";
+        private const string FieldName = "Position";
+        private const string NotAvailable = "not available";
+
+        public VisualElement GenerateFields(MonoBehaviour component, DataDictionary data)
+        {
+            VisualElement dataElement = new VisualElement();
+
+            if (data.TryGetValue(FieldName, out DataToken positionToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField(FieldName, positionToken.GetVector3()));
+            }
+            
+            if (data.TryGetValue(Rotation, out DataToken rotationToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Rotation: " , rotationToken.GetQuaternion()));
+            }
+            
+            if (data.TryGetValue(Velocity, out DataToken velocityToken))
+            {
+                if(velocityToken.TokenType != TokenType.DataDictionary)
+                    dataElement.Add(FieldFactory.GenerateField("Velocity: " , NotAvailable));
+                else
+                    dataElement.Add(FieldFactory.GenerateField("Velocity: " , velocityToken.GetVector3()));
+            }
+            
+            if (data.TryGetValue(Iskinematic, out DataToken isKinematicToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Is Kinematic: " , isKinematicToken.Boolean));
+            }
+            
+            if (data.TryGetValue(Usegravity, out DataToken useGravityToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Use Gravity: " , useGravityToken.Boolean));
+            }
+            
+            if (data.TryGetValue(Wassleeping, out DataToken wasSleepingToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Was Sleeping: " , wasSleepingToken.Boolean));
+            }
+            
+            if (data.TryGetValue(Time, out DataToken timeToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Time: " , (float)timeToken.Double));
+            }
+            
+            if (data.TryGetValue(Heldinhand, out DataToken heldInHandToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Held In Hand: " , heldInHandToken.String));
+            }
+            
+            if (data.TryGetValue(Discontinuity, out DataToken discontinuityToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Discontinuity: " , discontinuityToken.String));
+            }
+            
+            if (data.TryGetValue(Discontinuitycounter, out DataToken discontinuityCounterToken))
+            {
+                dataElement.Add(FieldFactory.GenerateField("Discontinuity Counter: " , discontinuityCounterToken.String));
+            }
+            
+            return dataElement;
+        }
+
+        public void UpdateFields(MonoBehaviour component, VisualElement dataElement, DataDictionary data)
+        {
+            if (data.TryGetValue(FieldName, out DataToken positionToken))
+            {
+                FieldFactory.UpdateField(dataElement[0], positionToken.GetVector3());
+            }
+            
+            if (data.TryGetValue(Rotation, out DataToken rotationToken))
+            {
+                FieldFactory.UpdateField(dataElement[1], rotationToken.GetQuaternion());
+            }
+            
+            if (data.TryGetValue(Velocity, out DataToken velocityToken))
+            {
+                if(velocityToken.TokenType != TokenType.DataDictionary)
+                    FieldFactory.UpdateField(dataElement[2], NotAvailable);
+                else
+                    FieldFactory.UpdateField(dataElement[2], velocityToken.GetVector3());
+            }
+            
+            if (data.TryGetValue(Iskinematic, out DataToken isKinematicToken))
+            {
+                FieldFactory.UpdateField(dataElement[3], isKinematicToken.Boolean);
+            }
+            
+            if (data.TryGetValue(Usegravity, out DataToken useGravityToken))
+            {
+                FieldFactory.UpdateField(dataElement[4], useGravityToken.Boolean);
+            }
+            
+            if (data.TryGetValue(Wassleeping, out DataToken wasSleepingToken))
+            {
+                FieldFactory.UpdateField(dataElement[5], wasSleepingToken.Boolean);
+            }
+            
+            if (data.TryGetValue(Time, out DataToken timeToken))
+            {
+                FieldFactory.UpdateField(dataElement[6], (float)timeToken.Double);
+            }
+            
+            if (data.TryGetValue(Heldinhand, out DataToken heldInHandToken))
+            {
+                FieldFactory.UpdateField(dataElement[7], heldInHandToken.String);
+            }
+            
+            if (data.TryGetValue(Discontinuity, out DataToken discontinuityToken))
+            {
+                FieldFactory.UpdateField(dataElement[8] , discontinuityToken.String);
+            }
+            
+            if (data.TryGetValue(Discontinuitycounter, out DataToken discontinuityCounterToken))
+            {
+                FieldFactory.UpdateField(dataElement[9], discontinuityCounterToken.String);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs.meta b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs.meta
new file mode 100644
index 0000000..1ca2e47
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimObjectSyncEncodeDecodeEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 77215cffe9bd4a6fa08514c2722c218a
+timeCreated: 1716478863
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs
new file mode 100644
index 0000000..47e2947
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements.Fields;
+using VRC.SDK3.Data;
+using VRC.SDKBase;
+using VRC.Udon;
+using VRC.Udon.Common.Interfaces;
+using VRC.Udon.Editor.ProgramSources.UdonGraphProgram.UI;
+using VRC.Udon.Editor.ProgramSources.UdonGraphProgram.UI.GraphView;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.EncodeDecodeEditors
+{
+    public class ClientSimUdonEncodeDecodeEditor : IClientSimEncodeDecoderEditor
+    {
+        public VisualElement GenerateFields(MonoBehaviour component,DataDictionary data)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            IEnumerable<IUdonSyncMetadata> SyncMetadatas = udonBehaviour.SyncMetadataTable.GetAllSyncMetadata();
+            VisualElement dataElement = new VisualElement();
+            foreach (IUdonSyncMetadata syncMetadata in SyncMetadatas)
+            {
+                if (data.ContainsKey(syncMetadata.Name))
+                {
+                    VisualElement field = FieldFactory.GenerateField(syncMetadata.Name, GetCorrectTypeFromDataToken(data[syncMetadata.Name]));
+                    field.name = syncMetadata.Name;
+                    dataElement.Add(field);
+                }
+            }
+            return dataElement;
+        }
+
+        public void UpdateFields(MonoBehaviour component, VisualElement dataElement, DataDictionary data)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            IEnumerable<IUdonSyncMetadata> SyncMetadatas = udonBehaviour.SyncMetadataTable.GetAllSyncMetadata();
+            int index = 0;
+            foreach (IUdonSyncMetadata syncMetadata in SyncMetadatas)
+            {
+                if (data.ContainsKey(syncMetadata.Name))
+                {
+                    FieldFactory.UpdateField(dataElement[index],  GetCorrectTypeFromDataToken(data[syncMetadata.Name]));
+                    
+                    index++;
+                }
+            }
+        }
+        
+        private object GetCorrectTypeFromDataToken(DataToken token)
+        {
+            switch (token.TokenType)
+            {
+                case TokenType.Boolean:
+                    return token.Boolean;
+                case TokenType.SByte:
+                    return token.SByte;
+                case TokenType.Byte:
+                    return token.Byte;
+                case TokenType.Short:
+                    return token.Short;
+                case TokenType.UShort:
+                    return token.UShort;
+                case TokenType.Int:
+                    return token.Int;
+                case TokenType.UInt:
+                    return token.UInt;
+                case TokenType.Long:
+                    return token.Long;
+                case TokenType.ULong:
+                    return token.ULong;
+                case TokenType.Float:
+                    return token.Float;
+                case TokenType.Double:
+                    return token.Double;
+                case TokenType.String:
+                    return token.String;
+                case TokenType.Reference:
+                    return token.Reference;
+                case TokenType.DataList:
+                    DataList dataList = token.DataList;
+                    object[] list = new object[dataList.Count];
+
+                    for(int i =0; i < dataList.Count; i++)
+                    {
+                        list[i] = GetCorrectTypeFromDataToken(dataList[i]);
+                    }
+                    return list;
+                case TokenType.DataDictionary:
+                    DataDictionary dataDictionary = token.DataDictionary;
+                    if(!dataDictionary.ContainsKey("T")) return null;
+                    
+                    string type = dataDictionary["T"].String;
+
+                    switch (type)
+                    {
+                        case "V2":
+                            return token.GetVector2();
+                        case "V3":
+                            return token.GetVector3();
+                        case "V4":
+                            return token.GetVector4();
+                        case "Q":
+                            return token.GetQuaternion();
+                        case "C":
+                            return token.GetColor();
+                        case "C32":
+                            return token.GetColor32();
+                        default:
+                            return null;
+                    }
+                default:
+                    return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs.meta b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs.meta
new file mode 100644
index 0000000..7415d49
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/ClientSimUdonEncodeDecodeEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1d6751e9563f4c939b96aaf7bbc7cb0f
+timeCreated: 1716481521
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs b/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs
new file mode 100644
index 0000000..22edab9
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.EncodeDecodeEditors
+{
+    public interface IClientSimEncodeDecoderEditor
+    {
+        public VisualElement GenerateFields(MonoBehaviour component, DataDictionary data);
+        public void UpdateFields(MonoBehaviour component, VisualElement dataElement, DataDictionary data);
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs.meta b/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs.meta
new file mode 100644
index 0000000..cc5af8e
--- /dev/null
+++ b/Source/Editor/VisualElements/EncodeDecodeEditors/IClientSimEncodeDecoderEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ccf6036bf1854d7f800ce01e60ab4d1c
+timeCreated: 1716478565
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields.meta b/Source/Editor/VisualElements/Fields.meta
new file mode 100644
index 0000000..6ae3cb6
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f0ace7b221a14ff8af6b1c0262de9da0
+timeCreated: 1716411089
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ByteField.cs b/Source/Editor/VisualElements/Fields/ByteField.cs
new file mode 100644
index 0000000..853af9f
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ByteField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class ByteField : TextValueField<byte>
+  {
+    /// <summary>
+    ///        <para>
+    /// USS class name of elements of this type.
+    /// </para>
+    ///      </summary>
+    public new static readonly string ussClassName = "vrc-byte-field";
+    /// <summary>
+    ///        <para>
+    /// USS class name of labels in elements of this type.
+    /// </para>
+    ///      </summary>
+    public new static readonly string labelUssClassName = ByteField.ussClassName + "__label";
+    /// <summary>
+    ///        <para>
+    /// USS class name of input elements in elements of this type.
+    /// </para>
+    ///      </summary>
+    public new static readonly string inputUssClassName = ByteField.ussClassName + "__input";
+
+    private ByteField.ByteInput byteInput => (ByteField.ByteInput) this.textInputBase;
+
+    /// <summary>
+    ///        <para>
+    /// Converts the given integer to a string.
+    /// </para>
+    ///      </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(byte v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///        <para>
+    /// Converts a string to an integer.
+    /// </para>
+    ///      </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override byte StringToValue(string str)
+    {
+      byte num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToByte(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///        <para>
+    /// Constructor.
+    /// </para>
+    ///      </summary>
+    public ByteField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///        <para>
+    /// Constructor.
+    /// </para>
+    ///      </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public ByteField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///        <para>
+    /// Constructor.
+    /// </para>
+    ///      </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public ByteField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<byte>.TextValueInput) new ByteField.ByteInput())
+    {
+      this.AddToClassList(ByteField.ussClassName);
+      this.labelElement.AddToClassList(ByteField.labelUssClassName);
+      this.AddLabelDragger<byte>();
+    }
+
+    /// <summary>
+    ///        <para>
+    /// Applies the values of a 3D delta and a speed from an input device.
+    /// </para>
+    ///      </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, byte startValue) => this.byteInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///        <para>
+    /// Instantiates an IntegerField using the data read from a UXML file.
+    /// </para>
+    ///      </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<ByteField, ByteField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///        <para>
+    /// Defines UxmlTraits for the IntegerField.
+    /// </para>
+    ///      </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class ByteInput : TextValueField<byte>.TextValueInput
+    {
+      private ByteField parentByteField => (ByteField) this.parent;
+
+      internal ByteInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, byte startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentByteField.isDelayed)
+          this.text = this.ValueToString((byte)Mathf.Clamp(num,0,255));
+        else
+          this.parentByteField.value = (byte)Mathf.Clamp(num,0,255);
+      }
+
+      protected override string ValueToString(byte v) => v.ToString(this.formatString);
+
+      protected override byte StringToValue(string str)
+      {
+        byte num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToByte(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/ByteField.cs.meta b/Source/Editor/VisualElements/Fields/ByteField.cs.meta
new file mode 100644
index 0000000..7ea76ec
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ByteField.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 00039a4bded043e386c649a36454b746
+timeCreated: 1716566750
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs b/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs
new file mode 100644
index 0000000..9abbfe6
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs
@@ -0,0 +1,40 @@
+using System;
+using UnityEngine;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+    public class ClientSimNumericFieldDraggerUtility
+    {
+        private static bool s_UseYSign;
+        private const double kDragSensitivity = 0.029999999329447746;
+        private const double kYSignThreshold = 0.10000000149011612;
+
+        internal static float Acceleration(bool shiftPressed, bool altPressed) => (float) ((shiftPressed ? 4.0 : 1.0) * (altPressed ? 0.25 : 1.0));
+
+        internal static float NiceDelta(Vector2 deviceDelta, float acceleration)
+        {
+            deviceDelta.y = -deviceDelta.y;
+            if ((double) Mathf.Abs(Mathf.Abs(deviceDelta.x) - Mathf.Abs(deviceDelta.y)) / (double) Mathf.Max(Mathf.Abs(deviceDelta.x), Mathf.Abs(deviceDelta.y)) > kYSignThreshold)
+                ClientSimNumericFieldDraggerUtility.s_UseYSign = (double) Mathf.Abs(deviceDelta.x) <= (double) Mathf.Abs(deviceDelta.y);
+            return ClientSimNumericFieldDraggerUtility.s_UseYSign ? Mathf.Sign(deviceDelta.y) * deviceDelta.magnitude * acceleration : Mathf.Sign(deviceDelta.x) * deviceDelta.magnitude * acceleration;
+        }
+
+        internal static double CalculateFloatDragSensitivity(double value) => double.IsInfinity(value) || double.IsNaN(value) ? 0.0 : Math.Max(1.0, Math.Pow(Math.Abs(value), 0.5)) * kDragSensitivity;
+
+        internal static double CalculateFloatDragSensitivity(
+            double value,
+            double minValue,
+            double maxValue)
+        {
+            return double.IsInfinity(value) || double.IsNaN(value) ? 0.0 : Math.Abs(maxValue - minValue) / 100.0 * kDragSensitivity;
+        }
+
+        internal static long CalculateIntDragSensitivity(long value) => (long) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((double) value);
+
+        internal static ulong CalculateIntDragSensitivity(ulong value) => (ulong) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((double) value);
+
+        private static double CalculateIntDragSensitivity(double value) => Math.Max(1.0, Math.Pow(Math.Abs(value), 0.5) * kDragSensitivity);
+
+        internal static long CalculateIntDragSensitivity(long value, long minValue, long maxValue) => Math.Max(1L, (long) (kDragSensitivity * (double) Math.Abs(maxValue - minValue) / 100.0));
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs.meta b/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs.meta
new file mode 100644
index 0000000..e1a651a
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ClientSimNumericFieldDraggerUtility.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 47c8de80824e4de98b823afd757d760c
+timeCreated: 1716567169
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs b/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs
new file mode 100644
index 0000000..9dfedf8
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs
@@ -0,0 +1,110 @@
+using UnityEngine;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+   
+    public class ClientSimUINumericFieldsUtils
+    { 
+        public static readonly string k_AllowedCharactersForFloat = "inftynaeINFTYNAE0123456789.,-*/+%^()cosqrludxvRL=pP#";
+        public static readonly string k_AllowedCharactersForByte = "0123456789-*/+%^()cosintaqrtelfundxvRL,=pPI#";
+        public static readonly string k_DoubleFieldFormatString = "R";
+        public static readonly string k_FloatFieldFormatString = "g7";
+        public static readonly string k_ByteFieldFormatString = "###0";
+        
+        public static bool TryConvertStringToLong(
+            string str,
+            out long value)
+        {
+            return ExpressionEvaluator.Evaluate<long>(str, out value);
+        }
+        
+        public static bool TryConvertStringToULong(
+            string str,
+            out ulong value)
+        {
+            return ExpressionEvaluator.Evaluate<ulong>(str, out value);
+        }
+        
+        public static bool TryConvertStringToLong(
+            string str,
+            string initialValueAsString,
+            out long value)
+        {
+            bool flag = TryConvertStringToLong(str, out value);
+            long num;
+            if (!flag && !string.IsNullOrEmpty(initialValueAsString) && TryConvertStringToLong(initialValueAsString, out num))
+            {
+                value = num;
+            }
+            return flag;
+        }
+        
+        public static bool TryConvertStringToByte(
+            string str,
+            string initialValueAsString,
+            out byte value)
+        {
+            long num;
+            bool flag = TryConvertStringToLong(str, initialValueAsString, out num);
+            value = (byte)Mathf.Clamp((int)num, (int)byte.MinValue, (int)byte.MaxValue);
+            return flag;
+        }
+        
+        public static bool TryConvertStringToSbyte(
+            string str,
+            string initialValueAsString,
+            out sbyte value)
+        {
+            long num;
+            bool flag = TryConvertStringToLong(str, initialValueAsString, out num);
+            value = (sbyte)Mathf.Clamp((int)num, (int)sbyte.MinValue, (int)sbyte.MaxValue);
+            return flag;
+        }
+        
+        public static bool TryConvertStringToUInt(
+            string str,
+            string initialValueAsString,
+            out uint value)
+        {
+            long num;
+            bool flag = TryConvertStringToLong(str, initialValueAsString, out num);
+            value = num < uint.MinValue ? uint.MinValue: num > uint.MaxValue ? uint.MaxValue : (uint)num;
+            return flag;
+        }
+        
+        public static bool TryConvertStringToULong(
+            string str,
+            string initialValueAsString,
+            out ulong value)
+        {
+            bool flag = TryConvertStringToULong(str, out value);
+            if (!flag && !string.IsNullOrEmpty(initialValueAsString) && TryConvertStringToULong(initialValueAsString, out ulong num))
+            {
+                value = num;
+            }
+            return flag;
+        }
+        
+        public static bool TryConvertStringToShort(
+            string str,
+            string initialValueAsString,
+            out short value)
+        {
+            long num;
+            bool flag = TryConvertStringToLong(str, initialValueAsString, out num);
+            value = num < short.MinValue ? short.MinValue: num > short.MaxValue ? short.MaxValue : (short)num;
+            return flag;
+        }
+        
+        public static bool TryConvertStringToUShort(
+            string str,
+            string initialValueAsString,
+            out ushort value)
+        {
+            long num;
+            bool flag = TryConvertStringToLong(str, initialValueAsString, out num);
+            value = num < ushort.MinValue ? ushort.MinValue: num > ushort.MaxValue ? ushort.MaxValue : (ushort)num;
+            return flag;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs.meta b/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs.meta
new file mode 100644
index 0000000..e41b68d
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ClientSimUINumericFieldsUtils.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 19c8c6acc9b1415c9b2efaadd21e3916
+timeCreated: 1716567113
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/FieldFactory.cs b/Source/Editor/VisualElements/Fields/FieldFactory.cs
new file mode 100644
index 0000000..2c8bf5c
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/FieldFactory.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+    public class FieldFactory
+    {
+        private static Dictionary<Type, (Func<string, VisualElement>, Action<VisualElement,object>)> _types =
+            new Dictionary<Type, (Func<string, VisualElement>, Action<VisualElement,object>)>()
+            {
+                { typeof(byte), ((name) => new ByteField(name), 
+                    (element, o) => ((ByteField)element).SetValueWithoutNotify((byte)o)) },
+                { typeof(sbyte), ((name) => new SbyteField(name), 
+                    (element, o) => ((SbyteField)element).SetValueWithoutNotify((sbyte)o)) },
+                { typeof(double), ((name) => new DoubleField(name), 
+                    (element, o) => ((DoubleField)element).SetValueWithoutNotify((double)o)) },
+                { typeof(float), ((name) => new FloatField(name), 
+                    (element, o) => ((FloatField)element).SetValueWithoutNotify((float)o)) },
+                { typeof(int), ((name) => new IntegerField(name), 
+                    (element, o) => ((IntegerField)element).SetValueWithoutNotify((int)o)) },
+                { typeof(uint), ((name) => new UIntField(name), 
+                    (element, o) => ((UIntField)element).SetValueWithoutNotify((uint)o)) },
+                { typeof(long), ((name => new LongField(name), 
+                    (element, o) => ((LongField)element).SetValueWithoutNotify((long)o))) },
+                { typeof(ulong), ((name) => new ULongField(name), 
+                    (element, o) => ((ULongField)element).SetValueWithoutNotify((ulong)o)) },
+                { typeof(short), ((name) => new ShortField(name), 
+                    (element, o) => ((ShortField)element).SetValueWithoutNotify((short)o)) },
+                { typeof(ushort), ((name) => new UShortField(name), 
+                    (element, o) => ((UShortField)element).SetValueWithoutNotify((ushort)o)) },
+                { typeof(string), ((name) => new TextField(name), 
+                    (element, o) => ((TextField)element).SetValueWithoutNotify((string)o)) },
+                { typeof(char), ((name) => new TextField(name) { maxLength = 1 }, 
+                    (element, o) => ((TextField)element).SetValueWithoutNotify(o.ToString())) },
+                { typeof(bool), ((name) => new Toggle(name), 
+                    (element, o) => ((Toggle)element).SetValueWithoutNotify((bool)o)) },
+                { typeof(Vector2), ((name) => new Vector2Field(name),
+                    (element, o) => ((Vector2Field)element).SetValueWithoutNotify((Vector2)o))},
+                { typeof(Vector3), ((name) => new Vector3Field(name),
+                    (element, o) => ((Vector3Field)element).SetValueWithoutNotify((Vector3)o))},
+                { typeof(Vector4), ((name) => new Vector4Field(name),
+                    (element, o) => ((Vector4Field)element).SetValueWithoutNotify((Vector4)o))},
+                { typeof(Quaternion), ((name) => new Vector3Field(name),
+                    (element, o) => ((Vector3Field)element).SetValueWithoutNotify(((Quaternion)o).eulerAngles))},
+                { typeof(Color), ((name) => new ColorField(name),
+                    (element, o) => ((ColorField)element).SetValueWithoutNotify((Color)o))},
+                { typeof(Color32), ((name) => new ColorField(name),
+                    (element, o) => ((ColorField)element).SetValueWithoutNotify((Color32)o))},
+            };
+        
+        private static Dictionary<Type,Type> _FieldType = new Dictionary<Type, Type>()
+        {
+            { typeof(byte), typeof(ByteField) },
+            { typeof(sbyte), typeof(SbyteField) },
+            { typeof(double), typeof(DoubleField) },
+            { typeof(float), typeof(FloatField) },
+            { typeof(int), typeof(IntegerField) },
+            { typeof(uint), typeof(UIntField) },
+            { typeof(long), typeof(LongField) },
+            { typeof(ulong), typeof(ULongField) },
+            { typeof(short), typeof(ShortField) },
+            { typeof(ushort), typeof(UShortField) },
+            { typeof(string), typeof(TextField) },
+            { typeof(char), typeof(TextField) },
+            { typeof(bool), typeof(Toggle) },
+            { typeof(Vector2), typeof(Vector2Field) },
+            { typeof(Vector3), typeof(Vector3Field) },
+            { typeof(Vector4), typeof(Vector4Field) },
+            { typeof(Quaternion), typeof(Vector3Field) },
+            { typeof(Color), typeof(ColorField) },
+            { typeof(Color32), typeof(ColorField) },
+        };
+        
+        public static VisualElement GenerateField<T>(string fieldName, T data)
+        {
+            Type type = data.GetType();
+
+            if (type.IsArray)
+            {
+                Foldout Array = new Foldout();
+                Array.text = fieldName;
+                
+                for (int i = 0; i < ((Array)(object)data).Length; i++)
+                {
+                    VisualElement field = GenerateField(i.ToString(), ((Array)(object)data).GetValue(i));
+                    field.name = i.ToString();
+                    Array.Add(field);
+                }
+                
+                return Array;
+            }
+            
+            if (_types.ContainsKey(type))
+            {
+                VisualElement field = _types[type].Item1(fieldName);
+                field.name = fieldName;
+                return field;
+            }
+            else
+            {
+                Label label = new Label(fieldName +" ("+type.Name+ "): " + data.ToString());
+                label.name = fieldName;
+                return label;
+            }
+        }
+        
+        public static bool UpdateField<T>(VisualElement field, T data)
+        {
+            Type type = data.GetType();
+
+            bool visible = true;
+            if (type.IsArray)
+            {
+                visible = false;
+                int length = Math.Min(((Array)(object)data).Length,field.childCount);
+                
+                for (int i = 0; i < length; i++)
+                {
+                    visible |= UpdateField(field[i], ((Array)(object)data).GetValue(i));
+                }
+                
+                if(length < field.childCount)
+                {
+                    for (int i = length; i < field.childCount; i++)
+                    {
+                        field[i].style.display = DisplayStyle.None;
+                    }
+                }
+                else if(length > field.childCount)
+                {
+                    for (int i = field.childCount; i < length; i++)
+                    {
+                        VisualElement newField = GenerateField(i.ToString(), ((Array)(object)data).GetValue(i));
+                        newField.name = i.ToString();
+                        field.Add(newField);
+                    }
+                }
+                
+                return visible;
+            }
+            
+            if (!_types.ContainsKey(type))
+            {
+                ((Label)field).text = field.name + "("+type.Name+ "): " + data.ToString();
+                return visible;
+            }
+            
+            // If the field is not the correct type, replace it with the correct type
+            // Can happen because json deserialization deserializes int, float, double, etc as double
+            if(_FieldType.ContainsKey(type))
+            {
+                if (field.GetType() != _FieldType[type])
+                {
+                    VisualElement newField = GenerateField(field.name, data);
+                    field.parent.Add(newField);
+                    newField.PlaceInFront(field);
+                    field.RemoveFromHierarchy();
+                    return true;
+                }
+            }
+            else
+            {
+                Label label = new Label(field.name +" ("+type.Name+ "): " + data.ToString());
+                label.name = field.name;
+                field.parent.Add(label);
+                field.RemoveFromHierarchy();
+                return true;
+            }
+            
+            _types[type].Item2(field, data);
+            return visible;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/FieldFactory.cs.meta b/Source/Editor/VisualElements/Fields/FieldFactory.cs.meta
new file mode 100644
index 0000000..2d15e02
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/FieldFactory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b4807fe039954aa0b1c03bf75d5c6bdb
+timeCreated: 1716411106
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/SbyteField.cs b/Source/Editor/VisualElements/Fields/SbyteField.cs
new file mode 100644
index 0000000..c0bb898
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/SbyteField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class SbyteField : TextValueField<sbyte>
+  {
+    /// <summary>
+    ///   <para>
+    ///     USS class name of elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string ussClassName = "vrc-sbyte-field";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of labels in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string labelUssClassName = SbyteField.ussClassName + "__label";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of input elements in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string inputUssClassName = SbyteField.ussClassName + "__input";
+
+    private SbyteField.SbyteInput sbyteInput => (SbyteField.SbyteInput) this.textInputBase;
+
+    /// <summary>
+    ///   <para>
+    ///     Converts the given integer to a string.
+    ///   </para>
+    /// </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(sbyte v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///   <para>
+    ///     Converts a string to an integer.
+    ///   </para>
+    /// </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override sbyte StringToValue(string str)
+    {
+      sbyte num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToSbyte(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    public SbyteField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public SbyteField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public SbyteField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<sbyte>.TextValueInput) new SbyteField.SbyteInput())
+    {
+      this.AddToClassList(SbyteField.ussClassName);
+      this.labelElement.AddToClassList(SbyteField.labelUssClassName);
+      this.AddLabelDragger<sbyte>();
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Applies the values of a 3D delta and a speed from an input device.
+    ///   </para>
+    /// </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, sbyte startValue) => this.sbyteInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///   <para>
+    ///     Instantiates an IntegerField using the data read from a UXML file.
+    ///   </para>
+    /// </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<SbyteField, SbyteField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Defines UxmlTraits for the IntegerField.
+    ///   </para>
+    /// </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class SbyteInput : TextValueField<sbyte>.TextValueInput
+    {
+      private SbyteField parentSByteField => (SbyteField) this.parent;
+
+      internal SbyteInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, sbyte startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentSByteField.isDelayed)
+          this.text = this.ValueToString((sbyte)Mathf.Clamp(num,sbyte.MinValue,sbyte.MaxValue));
+        else
+          this.parentSByteField.value = (sbyte)Mathf.Clamp(num,sbyte.MinValue,sbyte.MaxValue);
+      }
+
+      protected override string ValueToString(sbyte v) => v.ToString(this.formatString);
+
+      protected override sbyte StringToValue(string str)
+      {
+        sbyte num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToSbyte(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/SbyteField.cs.meta b/Source/Editor/VisualElements/Fields/SbyteField.cs.meta
new file mode 100644
index 0000000..81c1163
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/SbyteField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 344e9f5df1e2381419eed10bb8eb4c1b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Source/Editor/VisualElements/Fields/ShortField.cs b/Source/Editor/VisualElements/Fields/ShortField.cs
new file mode 100644
index 0000000..7f35d15
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ShortField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class ShortField : TextValueField<short>
+  {
+    /// <summary>
+    ///   <para>
+    ///     USS class name of elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string ussClassName = "vrc-short-field";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of labels in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string labelUssClassName = ShortField.ussClassName + "__label";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of input elements in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string inputUssClassName = ShortField.ussClassName + "__input";
+
+    private ShortField.ShortInput shortInput => (ShortField.ShortInput) this.textInputBase;
+
+    /// <summary>
+    ///   <para>
+    ///     Converts the given integer to a string.
+    ///   </para>
+    /// </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(short v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///   <para>
+    ///     Converts a string to an integer.
+    ///   </para>
+    /// </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override short StringToValue(string str)
+    {
+      short num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToShort(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    public ShortField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public ShortField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public ShortField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<short>.TextValueInput) new ShortField.ShortInput())
+    {
+      this.AddToClassList(ShortField.ussClassName);
+      this.labelElement.AddToClassList(ShortField.labelUssClassName);
+      this.AddLabelDragger<short>();
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Applies the values of a 3D delta and a speed from an input device.
+    ///   </para>
+    /// </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, short startValue) => this.shortInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///   <para>
+    ///     Instantiates an IntegerField using the data read from a UXML file.
+    ///   </para>
+    /// </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<ShortField, ShortField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Defines UxmlTraits for the IntegerField.
+    ///   </para>
+    /// </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class ShortInput : TextValueField<short>.TextValueInput
+    {
+      private ShortField parentByteField => (ShortField) this.parent;
+
+      internal ShortInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, short startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentByteField.isDelayed)
+          this.text = this.ValueToString((short)Mathf.Clamp(num,0,255));
+        else
+          this.parentByteField.value = (short)Mathf.Clamp(num,0,255);
+      }
+
+      protected override string ValueToString(short v) => v.ToString(this.formatString);
+
+      protected override short StringToValue(string str)
+      {
+        short num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToShort(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/ShortField.cs.meta b/Source/Editor/VisualElements/Fields/ShortField.cs.meta
new file mode 100644
index 0000000..7a71aae
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ShortField.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ef408243da1c4500b4542b7f7cc933ce
+timeCreated: 1717421533
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/UIntField.cs b/Source/Editor/VisualElements/Fields/UIntField.cs
new file mode 100644
index 0000000..ab7da70
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/UIntField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class UIntField : TextValueField<uint>
+  {
+    /// <summary>
+    ///   <para>
+    ///     USS class name of elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string ussClassName = "vrc-UInt-field";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of labels in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string labelUssClassName = UIntField.ussClassName + "__label";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of input elements in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string inputUssClassName = UIntField.ussClassName + "__input";
+
+    private UIntField.UIntInput sbyteInput => (UIntField.UIntInput) this.textInputBase;
+
+    /// <summary>
+    ///   <para>
+    ///     Converts the given integer to a string.
+    ///   </para>
+    /// </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(uint v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///   <para>
+    ///     Converts a string to an integer.
+    ///   </para>
+    /// </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override uint StringToValue(string str)
+    {
+      uint num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToUInt(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    public UIntField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public UIntField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public UIntField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<uint>.TextValueInput) new UIntField.UIntInput())
+    {
+      this.AddToClassList(UIntField.ussClassName);
+      this.labelElement.AddToClassList(UIntField.labelUssClassName);
+      this.AddLabelDragger<uint>();
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Applies the values of a 3D delta and a speed from an input device.
+    ///   </para>
+    /// </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, uint startValue) => this.sbyteInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///   <para>
+    ///     Instantiates an IntegerField using the data read from a UXML file.
+    ///   </para>
+    /// </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<UIntField, UIntField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Defines UxmlTraits for the IntegerField.
+    ///   </para>
+    /// </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class UIntInput : TextValueField<uint>.TextValueInput
+    {
+      private UIntField parentUIntField => (UIntField) this.parent;
+
+      internal UIntInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, uint startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentUIntField.isDelayed)
+          this.text = this.ValueToString((uint)Mathf.Clamp(num,uint.MinValue,uint.MaxValue));
+        else
+          this.parentUIntField.value = (uint)Mathf.Clamp(num,uint.MinValue,uint.MaxValue);
+      }
+
+      protected override string ValueToString(uint v) => v.ToString(this.formatString);
+
+      protected override uint StringToValue(string str)
+      {
+        uint num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToUInt(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/UIntField.cs.meta b/Source/Editor/VisualElements/Fields/UIntField.cs.meta
new file mode 100644
index 0000000..3f7b5ad
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/UIntField.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d60bebe1b61e4fec9775a266a41b8ea9
+timeCreated: 1716966716
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/ULongField.cs b/Source/Editor/VisualElements/Fields/ULongField.cs
new file mode 100644
index 0000000..ef20b0e
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ULongField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class ULongField : TextValueField<ulong>
+  {
+    /// <summary>
+    ///   <para>
+    ///     USS class name of elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string ussClassName = "vrc-ulong-field";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of labels in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string labelUssClassName = ULongField.ussClassName + "__label";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of input elements in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string inputUssClassName = ULongField.ussClassName + "__input";
+
+    private ULongField.ULongInput sbyteInput => (ULongField.ULongInput) this.textInputBase;
+
+    /// <summary>
+    ///   <para>
+    ///     Converts the given integer to a string.
+    ///   </para>
+    /// </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(ulong v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///   <para>
+    ///     Converts a string to an integer.
+    ///   </para>
+    /// </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override ulong StringToValue(string str)
+    {
+      ulong num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToULong(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    public ULongField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public ULongField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public ULongField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<ulong>.TextValueInput) new ULongField.ULongInput())
+    {
+      this.AddToClassList(UIntField.ussClassName);
+      this.labelElement.AddToClassList(UIntField.labelUssClassName);
+      this.AddLabelDragger<ulong>();
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Applies the values of a 3D delta and a speed from an input device.
+    ///   </para>
+    /// </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ulong startValue) => this.sbyteInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///   <para>
+    ///   Instantiates an IntegerField using the data read from a UXML file.
+    ///   </para>
+    /// </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<ULongField, ULongField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Defines UxmlTraits for the IntegerField.
+    ///   </para>
+    /// </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class ULongInput : TextValueField<ulong>.TextValueInput
+    {
+      private ULongField parentULongField => (ULongField) this.parent;
+
+      internal ULongInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ulong startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentULongField.isDelayed)
+          this.text = this.ValueToString((uint)Mathf.Clamp(num,uint.MinValue,uint.MaxValue));
+        else
+          this.parentULongField.value = (uint)Mathf.Clamp(num,uint.MinValue,uint.MaxValue);
+      }
+
+      protected override string ValueToString(ulong v) => v.ToString(this.formatString);
+
+      protected override ulong StringToValue(string str)
+      {
+        ulong num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToULong(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/ULongField.cs.meta b/Source/Editor/VisualElements/Fields/ULongField.cs.meta
new file mode 100644
index 0000000..5e13c53
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/ULongField.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e4558ecaaa6441868c8be3649d1222b4
+timeCreated: 1716968548
\ No newline at end of file
diff --git a/Source/Editor/VisualElements/Fields/UShortField.cs b/Source/Editor/VisualElements/Fields/UShortField.cs
new file mode 100644
index 0000000..c68c2d4
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/UShortField.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Globalization;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VRC.SDK3.ClientSim.Editor.VisualElements.Fields
+{
+  public class UShortField : TextValueField<ushort>
+  {
+    /// <summary>
+    ///   <para>
+    ///     USS class name of elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string ussClassName = "vrc-ushort-field";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of labels in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string labelUssClassName = UShortField.ussClassName + "__label";
+    /// <summary>
+    ///   <para>
+    ///     USS class name of input elements in elements of this type.
+    ///   </para>
+    /// </summary>
+    public new static readonly string inputUssClassName = UShortField.ussClassName + "__input";
+
+    private UShortField.UShortInput ushortInput => (UShortField.UShortInput) this.textInputBase;
+
+    /// <summary>
+    ///   <para>
+    ///     Converts the given integer to a string.
+    ///   </para>
+    /// </summary>
+    /// <param name="v">The integer to be converted to string.</param>
+    /// <returns>
+    ///   <para>The integer as string.</para>
+    /// </returns>
+    protected override string ValueToString(ushort v) => v.ToString(this.formatString, (IFormatProvider) CultureInfo.InvariantCulture.NumberFormat);
+
+    /// <summary>
+    ///   <para>
+    ///     Converts a string to an integer.
+    ///   </para>
+    /// </summary>
+    /// <param name="str">The string to convert.</param>
+    /// <returns>
+    ///   <para>The integer parsed from the string.</para>
+    /// </returns>
+    protected override ushort StringToValue(string str)
+    {
+      ushort num;
+      return ClientSimUINumericFieldsUtils.TryConvertStringToUShort(str, this.textInputBase.text, out num) ? num : this.rawValue;
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    public UShortField()
+      : this((string) null)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    public UShortField(int maxLength)
+      : this((string) null, maxLength)
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Constructor.
+    ///   </para>
+    /// </summary>
+    /// <param name="maxLength">Maximum number of characters the field can take.</param>
+    /// <param name="label"></param>
+    public UShortField(string label, int maxLength = -1)
+      : base(label, maxLength, (TextValueField<ushort>.TextValueInput) new UShortField.UShortInput())
+    {
+      this.AddToClassList(UShortField.ussClassName);
+      this.labelElement.AddToClassList(UShortField.labelUssClassName);
+      this.AddLabelDragger<ushort>();
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Applies the values of a 3D delta and a speed from an input device.
+    ///   </para>
+    /// </summary>
+    /// <param name="delta">A vector used to compute the value change.</param>
+    /// <param name="speed">A multiplier for the value change.</param>
+    /// <param name="startValue">The start value.</param>
+    public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ushort startValue) => this.ushortInput.ApplyInputDeviceDelta(delta, speed, startValue);
+
+    /// <summary>
+    ///   <para>
+    ///     Instantiates an IntegerField using the data read from a UXML file.
+    ///   </para>
+    /// </summary>
+    public new class UxmlFactory : UnityEngine.UIElements.UxmlFactory<UShortField, UShortField.UxmlTraits>
+    {
+    }
+
+    /// <summary>
+    ///   <para>
+    ///     Defines UxmlTraits for the IntegerField.
+    ///   </para>
+    /// </summary>
+    public new class UxmlTraits : TextValueFieldTraits<int, UxmlIntAttributeDescription>
+    {
+    }
+
+    private class UShortInput : TextValueField<ushort>.TextValueInput
+    {
+      private UShortField parentByteField => (UShortField) this.parent;
+
+      internal UShortInput() => this.formatString = ClientSimUINumericFieldsUtils.k_ByteFieldFormatString;
+
+      protected override string allowedCharacters => ClientSimUINumericFieldsUtils.k_AllowedCharactersForByte;
+
+      public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ushort startValue)
+      {
+        double intDragSensitivity = (double) ClientSimNumericFieldDraggerUtility.CalculateIntDragSensitivity((long) startValue);
+        float acceleration = ClientSimNumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+        long num = (long) this.StringToValue(this.text) + (long) Math.Round((double) ClientSimNumericFieldDraggerUtility.NiceDelta((Vector2) delta, acceleration) * intDragSensitivity);
+        if (this.parentByteField.isDelayed)
+          this.text = this.ValueToString((ushort)Mathf.Clamp(num,0,255));
+        else
+          this.parentByteField.value = (ushort)Mathf.Clamp(num,0,255);
+      }
+
+      protected override string ValueToString(ushort v) => v.ToString(this.formatString);
+
+      protected override ushort StringToValue(string str)
+      {
+        ushort num;
+        ClientSimUINumericFieldsUtils.TryConvertStringToUShort(str, this.text, out num);
+        return num;
+      }
+    }
+  }
+}
diff --git a/Source/Editor/VisualElements/Fields/UShortField.cs.meta b/Source/Editor/VisualElements/Fields/UShortField.cs.meta
new file mode 100644
index 0000000..519baf5
--- /dev/null
+++ b/Source/Editor/VisualElements/Fields/UShortField.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2134bc1ca6ec4053bcfecd5650b4efdf
+timeCreated: 1717422039
\ No newline at end of file
diff --git a/Source/Editor/Windows/ClientSimPlayerDataWindow.cs b/Source/Editor/Windows/ClientSimPlayerDataWindow.cs
new file mode 100644
index 0000000..89201da
--- /dev/null
+++ b/Source/Editor/Windows/ClientSimPlayerDataWindow.cs
@@ -0,0 +1,966 @@
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Persistence;
+using VRC.SDK3.Persistence;
+using VRC.SDKBase;
+using Random = UnityEngine.Random;
+
+namespace VRC.SDK3.ClientSim.Editor
+{
+    public class ClientSimPlayerDataWindow : EditorWindow
+    {
+        // max number of characters to display PlayerData values with (value strings longer than this are truncated)
+        private const int MAX_LENGTH_SINGLE_LINE = 50;
+        private const int MAX_LENGTH_MULTI_LINE = 10000;
+
+        // number of PlayerData elements to show per page 
+        private const int PAGE_SIZE = 12;
+
+        // key used to store selected sort mode in player prefs
+        private const string SORT_MODE_KEY = "PlayerDataSortMode";
+        
+        private bool hasLocalPlayerData;
+        private bool isLocalPlayerSelected = true;
+        private string localPlayerName;
+        private int page;
+        private int numPages;
+        
+        private Dictionary<string, ClientSimPlayerDataPair> localPlayerData;
+        private IClientSimEventDispatcher eventDispatcher;
+        private VisualElement labelContainer;
+        private VisualElement noDataInfoContainer;
+        private VisualElement pagingContainer;
+        private Label pageLabel;
+        private readonly List<VisualElement> elementsToDisableInPlayMode = new();
+        private DropdownField playerDropdown;
+        private DropdownField sortDropdown;
+        private Button addRemotePlayerTestDataButton;
+        private Button nextPageButton;
+        private Button prevPageButton;
+        private Button clearDataButton;
+        
+        private static string LocalPlayerDataRoot
+        {
+            get
+            {
+                string root = Path.GetDirectoryName(Application.dataPath);
+                string path = Path.Combine(root, ClientSimPlayerDataStorage.PlayerDataFolder);
+                if (!Directory.Exists(path))
+                {
+                    Directory.CreateDirectory(path);
+                }
+                return path;
+            }
+        }
+
+        private static string LocalPlayerDataPath => LocalPlayerDataRoot + $"/PlayerData_1_{SceneManager.GetActiveScene().name}.json";
+        private static string LocalDataPathPattern => $"PlayerData_*_{SceneManager.GetActiveScene().name}.json";
+        
+        [MenuItem("VRChat SDK/ClientSim PlayerData", false, 1500)]
+        public static void Init()
+        {
+            var window = GetWindow<ClientSimPlayerDataWindow>(false, "ClientSim PlayerData");
+            window.minSize = new Vector2(400, 400);
+            window.Show();
+        }
+        
+        private static void SetData(ClientSimPlayerDataPair data, VRCPlayerApi player)
+        {
+            var playerData = player.GetClientSimPlayer().PlayerDataObject;
+            switch (data.Value.Type)
+            {
+                case ClientSimPlayerDataType.Vector2:
+                    playerData.SetVector2(data.Key, data.Value.AsVector2());
+                    break;
+                case ClientSimPlayerDataType.Vector3:
+                    playerData.SetVector3(data.Key, data.Value.AsVector3());
+                    break;
+                case ClientSimPlayerDataType.Vector4:
+                    playerData.SetVector4(data.Key, data.Value.AsVector4());
+                    break;
+                case ClientSimPlayerDataType.Quaternion:
+                    playerData.SetQuaternion(data.Key, data.Value.AsQuaternion());
+                    break;
+                case ClientSimPlayerDataType.Color:
+                    playerData.SetColor(data.Key, data.Value.AsColor()); 
+                    break;
+                case ClientSimPlayerDataType.Color32:
+                    playerData.SetColor32(data.Key, data.Value.AsColor32());
+                    break;
+                case ClientSimPlayerDataType.WrappedString:
+                    playerData.SetString(data.Key, data.Value.AsWrappedString());
+                    break;
+                case ClientSimPlayerDataType.WrappedShort:
+                    playerData.SetShort(data.Key, data.Value.AsWrappedShort());
+                    break;
+                case ClientSimPlayerDataType.WrappedInt:
+                    playerData.SetInt(data.Key, data.Value.AsWrappedInt());
+                    break;
+                case ClientSimPlayerDataType.WrappedFloat:
+                    playerData.SetFloat(data.Key, data.Value.AsWrappedFloat());
+                    break;
+                case ClientSimPlayerDataType.WrappedBool:
+                    playerData.SetBool(data.Key, data.Value.AsWrappedBool());
+                    break;
+                case ClientSimPlayerDataType.WrappedByte:
+                    playerData.SetSByte(data.Key, data.Value.AsWrappedSByte());
+                    break;
+                case ClientSimPlayerDataType.WrappedUByte:
+                    playerData.SetByte(data.Key, data.Value.AsWrappedUByte());
+                    break;
+                case ClientSimPlayerDataType.WrappedBytes:
+                    playerData.SetBytes(data.Key, data.Value.AsWrappedBytes());
+                    break;
+                case ClientSimPlayerDataType.WrappedUShort:
+                    playerData.SetUShort(data.Key, data.Value.AsWrappedUShort());
+                    break;
+                case ClientSimPlayerDataType.WrappedUInt:
+                    playerData.SetUInt(data.Key, data.Value.AsWrappedUInt());
+                    break;
+                case ClientSimPlayerDataType.WrappedULong:
+                    playerData.SetULong(data.Key, data.Value.AsWrappedULong());
+                    break;
+                case ClientSimPlayerDataType.WrappedDouble:
+                    playerData.SetDouble(data.Key, data.Value.AsWrappedDouble());
+                    break;
+                case ClientSimPlayerDataType.WrappedLong:
+                    playerData.SetLong(data.Key, data.Value.AsWrappedLong());
+                    break;
+            }
+        }
+
+        public void OnEnable()
+        {
+            VisualElement root = rootVisualElement;
+            VisualTreeAsset visualTree = Resources.Load<VisualTreeAsset>(nameof(ClientSimPlayerDataWindow));
+            root.Add(visualTree.CloneTree());
+
+            Button openDataFolderButton = root.Q<Button>("OpenDataFolderButton");
+            Button refreshDataButton = root.Q<Button>("RefreshDataButton");
+            clearDataButton = root.Q<Button>("ClearDataButton");
+            nextPageButton = root.Q<Button>("NextPageButton");
+            prevPageButton = root.Q<Button>("PreviousPageButton");
+            addRemotePlayerTestDataButton = root.Q<Button>("RandomizeButton");
+            playerDropdown = root.Q<DropdownField>("PlayerDropdown");
+            sortDropdown = root.Q<DropdownField>("SortDropdown");
+            noDataInfoContainer = root.Q<VisualElement>("NoDataInfo");
+            pagingContainer = root.Q<VisualElement>("Paging");
+            pageLabel = root.Q<Label>("PageLabel");
+            ScrollView playerDataList = root.Q<ScrollView>("PlayerDataList");
+
+            labelContainer = new VisualElement();
+            playerDataList.Add(labelContainer);
+
+            openDataFolderButton.clicked += OpenLocalDataDirectory;
+            refreshDataButton.clicked += RefreshPlayerData;
+            clearDataButton.clicked += ClearPlayerData;
+            nextPageButton.clicked += NextPage;
+            prevPageButton.clicked += PreviousPage;
+            addRemotePlayerTestDataButton.clicked += AddRemotePlayerTestData;
+            
+            // dropdown always includes local player so that users can view PlayerData outside of play mode
+            CheckLocalPlayerName();
+            playerDropdown.choices = new List<string> { localPlayerName };
+            playerDropdown.index = 0;
+            playerDropdown.RegisterValueChangedCallback(OnPlayerSelected);
+            
+            // load sort mode from player prefs - it will be applied in LoadPlayerData
+            sortDropdown.SetValueWithoutNotify(PlayerPrefs.GetString(SORT_MODE_KEY, "Alphabetically"));
+            sortDropdown.RegisterValueChangedCallback(OnSortSelected);
+            
+            LoadPlayerData();
+            UpdatePage(false);
+            
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+            if (EditorApplication.isPlaying)
+            {
+                OnPlayModeStateChanged(PlayModeStateChange.EnteredPlayMode);
+            }
+            
+            // reload data on scene switch
+            EditorSceneManager.sceneOpened += (_, _) => LoadPlayerData();
+        }
+
+        private void AddRemotePlayerTestData()
+        {
+            object RandomizePlayerDataValue(ClientSimPlayerDataTypeUnion dataPoint)
+            {
+                return dataPoint.Type switch
+                {
+                    ClientSimPlayerDataType.Vector2 => new Vector2(Random.Range(0,100), Random.Range(0,100)),
+                    ClientSimPlayerDataType.Vector3 => new Vector3(Random.Range(0,100), Random.Range(0,100), Random.Range(0,100)),
+                    ClientSimPlayerDataType.Vector4 => new Vector4(Random.Range(0,100), Random.Range(0,100), Random.Range(0,100), Random.Range(0,100)),
+                    ClientSimPlayerDataType.Quaternion => new Quaternion(Random.Range(0,100), Random.Range(0,100), Random.Range(0,100), Random.Range(0,100)),
+                    ClientSimPlayerDataType.Color => new Color(Random.Range(0,1f), Random.Range(0,1f), Random.Range(0,1f), Random.Range(0,1f)),
+                    ClientSimPlayerDataType.Color32 => (Color32)new Color(Random.Range(0,1f), Random.Range(0,1f), Random.Range(0,1f), Random.Range(0,1f)),
+                    ClientSimPlayerDataType.WrappedString => MakeRandomString(),
+                    ClientSimPlayerDataType.WrappedShort => (short)Random.Range(-10, 10),
+                    ClientSimPlayerDataType.WrappedInt => Random.Range(-100, 100),
+                    ClientSimPlayerDataType.WrappedFloat => Random.Range(0, 1f),
+                    ClientSimPlayerDataType.WrappedBool => Random.Range(0, 2) != 0,
+                    ClientSimPlayerDataType.WrappedByte => (sbyte)Random.Range(sbyte.MinValue, sbyte.MaxValue),
+                    ClientSimPlayerDataType.WrappedUByte => (byte)Random.Range(byte.MinValue, byte.MaxValue),
+                    ClientSimPlayerDataType.WrappedBytes => MakeRandomByteArray(),
+                    ClientSimPlayerDataType.WrappedUShort => (ushort)Random.Range(0, 10),
+                    ClientSimPlayerDataType.WrappedUInt => (uint)Random.Range(0, 100),
+                    ClientSimPlayerDataType.WrappedULong => (ulong)Random.Range(0, 1000),
+                    ClientSimPlayerDataType.WrappedDouble => (double)Random.Range(0, 0.1f),
+                    ClientSimPlayerDataType.WrappedLong => (long)Random.Range(-1000, 1000),
+                    _ => default
+                };
+            }
+
+            string MakeRandomString()
+            {
+                const string characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+                string result = "";
+                for (int i = 0; i < 10; i++)
+                {
+                    result += characters[Random.Range(0, characters.Length)];
+                }
+                return result;
+            }
+
+            byte[] MakeRandomByteArray()
+            {
+                byte[] randomBytes = new byte[2];
+                for (int i = 0; i < randomBytes.Length; i++)
+                {
+                    randomBytes[i] = (byte)Random.Range(byte.MinValue, byte.MaxValue + 1);
+                }
+                return randomBytes;
+            }
+
+            string playerName = playerDropdown.value;
+            VRCPlayerApi player = VRCPlayerApi.AllPlayers.Find(p => p.displayName.Equals(playerName));
+            if (player.isLocal) return;
+            
+            foreach (var kvp in localPlayerData)
+            {
+                var randomizedValue = RandomizePlayerDataValue(kvp.Value.Value);
+                var typeUnion = new ClientSimPlayerDataTypeUnion
+                {
+                    Type = kvp.Value.Value.Type,
+                    Value = randomizedValue
+                };
+                var dataPair = new ClientSimPlayerDataPair
+                {
+                    Key = kvp.Key,
+                    Value = typeUnion
+                };
+                SetData(dataPair, player);
+            }
+        }
+        
+        private void OnPlayerSelected(ChangeEvent<string> playerSelectedEvent)
+        {
+            string selectedPlayerName = playerSelectedEvent.newValue;
+            bool isLocalPlayer = string.Equals(selectedPlayerName, localPlayerName);
+            addRemotePlayerTestDataButton.style.display = isLocalPlayer || !hasLocalPlayerData 
+                ? DisplayStyle.None 
+                : DisplayStyle.Flex;
+
+            isLocalPlayerSelected = isLocalPlayer;
+            if (isLocalPlayer)
+            {
+                LoadPlayerData(Networking.LocalPlayer);
+                return;
+            }
+
+            foreach (VRCPlayerApi player in VRCPlayerApi.AllPlayers)
+            {
+                if (player.displayName.Equals(selectedPlayerName))
+                {
+                    LoadPlayerData(player);
+                    break;
+                }
+            }
+        }
+
+        private void OnSortSelected(ChangeEvent<string> evt)
+        {
+            PlayerPrefs.SetString(SORT_MODE_KEY, evt.newValue);
+            LoadPlayerDataForSelectedPlayer();   
+        }
+        
+        private void LoadPlayerDataForSelectedPlayer()
+        {
+            if (!EditorApplication.isPlaying)
+            {
+                LoadPlayerData();
+                return;
+            }
+            
+            string selectedPlayerName = playerDropdown.value;
+            foreach (VRCPlayerApi player in VRCPlayerApi.AllPlayers)
+            {
+                if (player.displayName.Equals(selectedPlayerName))
+                {
+                    LoadPlayerData(player);
+                    break;
+                }
+            }
+        }
+        
+        private void OnDisable()
+        {
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+        }
+
+        private void LoadPlayerData(VRCPlayerApi player = null, bool broadcastPlayerDataUpdated = false)
+        {
+            // outside of play mode, we don't have a player game object
+            string path = player == null ? LocalPlayerDataPath : ClientSimPlayerDataStorage.PlayerDataFilePath(player);
+            if (!File.Exists(path))
+            {
+                File.WriteAllText(path, "{}");
+                CheckDataEmpty();
+            }
+            else
+            {
+                string json = File.ReadAllText(path);
+                var data = JsonConvert.DeserializeObject<Dictionary<string, ClientSimPlayerDataPair>>(json);
+                UpdatePlayerDataList(data, player);
+
+                // when adding test data for a remote player, let the rest of the system know
+                if (EditorApplication.isPlaying && broadcastPlayerDataUpdated)
+                {
+                    var infos = data
+                        .Select(kvp => new PlayerData.Info(kvp.Key, PlayerData.State.Added))
+                        .ToArray();
+                    
+                    player.GetClientSimPlayer().PlayerDataObject.QueuePlayerDataUpdate(infos);
+                }
+            }
+        }
+
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.EnteredPlayMode)
+            {
+                eventDispatcher = ClientSimMain.GetInstance().GetEventDispatcher();
+                eventDispatcher.Subscribe<ClientSimOnPlayerRestoredEvent>(OnPlayerRestored);
+                eventDispatcher.Subscribe<ClientSimOnPlayerDataUpdatedEvent>(OnPlayerDataUpdated);
+                eventDispatcher.Subscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+                eventDispatcher.Subscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
+
+                CheckLocalPlayerName();
+                playerDropdown.choices[0] = localPlayerName;
+                playerDropdown.value = localPlayerName;
+                
+                elementsToDisableInPlayMode.ForEach(e => e.SetEnabled(false));
+            }
+            else if (state == PlayModeStateChange.ExitingPlayMode)
+            {
+                playerDropdown.choices.RemoveRange(1, playerDropdown.choices.Count - 1);
+                playerDropdown.index = 0;
+
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerRestoredEvent>(OnPlayerRestored);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerDataUpdatedEvent>(OnPlayerDataUpdated);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
+                eventDispatcher = null;
+                
+                elementsToDisableInPlayMode.ForEach(e => e.SetEnabled(true));
+            }
+        }
+
+        private void OnPlayerRestored(ClientSimOnPlayerRestoredEvent payload)
+        {
+            LoadPlayerData(payload.player);
+        }
+        
+        private void OnPlayerDataUpdated(ClientSimOnPlayerDataUpdatedEvent payload)
+        {
+            UpdatePlayerDataList(payload.playerData, payload.player);
+        }
+
+        private void OnPlayerJoined(ClientSimOnPlayerJoinedEvent payload)
+        {
+            // local player is initialized via ClientSim init flow
+            if (payload.player.isLocal) return;
+            
+            if (!playerDropdown.choices.Contains(payload.player.displayName))
+            {
+                playerDropdown.choices.Add(payload.player.displayName);
+            }
+        }
+
+        private void OnPlayerLeft(ClientSimOnPlayerLeftEvent payload)
+        {
+            if (payload.player.isLocal) return;
+            if (playerDropdown.choices.Contains(payload.player.displayName))
+            {
+                playerDropdown.choices.Remove(payload.player.displayName);
+            }
+
+            if (playerDropdown.value.Equals(payload.player.displayName))
+            {
+                playerDropdown.index = 0;
+            }
+        }
+
+        private void UpdatePlayerDataList(Dictionary<string, ClientSimPlayerDataPair> playerData, VRCPlayerApi player = null, bool redraw = true)
+        {
+            numPages = playerData.Count % PAGE_SIZE == 0
+                ? playerData.Count / PAGE_SIZE
+                : playerData.Count / PAGE_SIZE + 1;
+            UpdatePage(false);
+            
+            if (player != null)
+            {
+                // show button for adding test data if local player has data and a remote player is selected
+                if (player.isLocal)
+                {
+                    localPlayerData = playerData;
+                    if (!hasLocalPlayerData && localPlayerData.Count > 0)
+                    {
+                        hasLocalPlayerData = true;
+                        if (!isLocalPlayerSelected)
+                        {
+                            addRemotePlayerTestDataButton.style.display = DisplayStyle.Flex;
+                        }
+                    }
+                }
+
+                // only update display if data is updated for currently selected player
+                if (!string.Equals(player.displayName, playerDropdown.value)) return;
+            }
+
+            if (!redraw || CheckDataEmpty(playerData.Count))
+            {
+                return;
+            }
+
+            var sorted = sortDropdown.value switch
+            {
+                // sorts by key
+                "Alphabetically" => playerData.OrderBy(x => x.Key).ToList(),
+
+                // sorts by what keys were most recently set
+                "Last Updated" => playerData
+                    .OrderBy(x => x.Value.LastUpdated)
+                    .ThenBy(x => x.Key)
+                    .Reverse()
+                    .ToList(),
+                
+                // sorts data as shown in the JSON
+                _ => playerData.ToList()
+
+            };
+
+            // color fields don't have an isDelayed property, so we disable them in play mode 
+            elementsToDisableInPlayMode.Clear();
+
+            int pageIndex = 0;
+            int labelIndex = 0;
+            foreach (var kvp in sorted)
+            {
+                // paging
+                if (labelIndex >= PAGE_SIZE)
+                {
+                    labelIndex = 0;
+                    pageIndex++;
+                }
+                labelIndex++;
+                if (pageIndex != page) continue;
+                
+                VisualElement valueField;
+                switch (kvp.Value.Value.Type)
+                {
+                    case ClientSimPlayerDataType.Vector2:
+                        Vector2Field vector2Field = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsVector2()
+                        };
+                        SetIsDelayedForCompositeField(vector2Field);
+                        vector2Field.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = vector2Field;
+                        break;
+                    
+                    case ClientSimPlayerDataType.Vector3:
+                        Vector3Field vector3Field = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsVector3()
+                        };
+                        SetIsDelayedForCompositeField(vector3Field);
+                        vector3Field.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = vector3Field;
+                        break;
+                    
+                    case ClientSimPlayerDataType.Vector4:
+                        Vector4Field vector4Field = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsVector4()
+                        };
+                        SetIsDelayedForCompositeField(vector4Field);
+                        vector4Field.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = vector4Field;
+                        break;
+                    
+                    // show quaternions as euler angles, so they're more intuitive to edit
+                    case ClientSimPlayerDataType.Quaternion:
+                        Vector3Field quaternionField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsQuaternion().eulerAngles
+                        };
+                        SetIsDelayedForCompositeField(quaternionField);
+                        quaternionField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = quaternionField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.Color:
+                        ColorField colorField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsColor()
+                        };
+                        colorField.RegisterValueChangedCallback(ValueFieldCallback);
+                        colorField.SetEnabled(!EditorApplication.isPlaying);
+                        elementsToDisableInPlayMode.Add(colorField);
+                        valueField = colorField;
+                        break;
+                    
+                    // color32 is shown as a regular color field
+                    case ClientSimPlayerDataType.Color32:
+                        ColorField color32Field = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsColor32()
+                        };
+                        color32Field.RegisterValueChangedCallback(ValueFieldCallback);
+                        color32Field.SetEnabled(!EditorApplication.isPlaying);
+                        elementsToDisableInPlayMode.Add(color32Field);
+                        valueField = color32Field;
+                        break;
+                    
+                    // string fields are multiline
+                    case ClientSimPlayerDataType.WrappedString:
+                        TextField textField = new()
+                        {
+                            label = kvp.Key, 
+                            value = Truncate(true, kvp.Value.Value.AsWrappedString()),
+                            isDelayed = true,
+                            multiline = true,
+                            maxLength = MAX_LENGTH_MULTI_LINE
+                        };
+                        textField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = textField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedShort:
+                        IntegerField shortField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedShort(), 
+                            isDelayed = true
+                        };
+                        shortField.RegisterValueChangedCallback(e =>
+                        {
+                            if (e.newValue is >= short.MinValue and <= short.MaxValue)
+                            {
+                                ValueFieldCallback(e);
+                            }
+                            else
+                            {
+                                shortField.SetValueWithoutNotify(e.previousValue);
+                            }
+                        });
+                        valueField = shortField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedInt:
+                        IntegerField intField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedInt(), 
+                            isDelayed = true
+                        };
+                        intField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = intField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedFloat:
+                        FloatField floatField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedFloat(), 
+                            isDelayed = true
+                        };
+                        floatField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = floatField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedBool:
+                        Toggle toggle = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedBool()
+                        };
+                        toggle.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = toggle;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedByte:
+                        IntegerField sbyteField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedSByte(), 
+                            isDelayed = true
+                        };
+                        sbyteField.RegisterValueChangedCallback(e =>
+                        {
+                            if (e.newValue is >= sbyte.MinValue and <= sbyte.MaxValue)
+                            {
+                                ValueFieldCallback(e);
+                            }
+                            else
+                            {
+                                sbyteField.SetValueWithoutNotify(e.previousValue);
+                            }
+                        });
+                        valueField = sbyteField;
+                        break;
+                    
+                    // byte arrays are readonly to avoid confusion about encoding and format
+                    // users can still manually set byte array values in the JSON if needed
+                    case ClientSimPlayerDataType.WrappedBytes:
+                        var byteArray = kvp.Value.Value.AsWrappedBytes();
+                        string readableValue = byteArray.Aggregate("[ ", (current, b) => current + $"{(int)b} ") + "]";
+                        TextField bytesField = new()
+                        {
+                            label = kvp.Key, 
+                            value = Truncate(false, readableValue), 
+                            isDelayed = true,
+                            maxLength = MAX_LENGTH_SINGLE_LINE
+                        };
+                        bytesField.SetEnabled(false);
+                        valueField = bytesField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedUShort:
+                        UnsignedIntegerField ushortField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedUShort(), 
+                            isDelayed = true,
+                        };
+                        ushortField.RegisterValueChangedCallback(e =>
+                        {
+                            if (e.newValue <= ushort.MaxValue)
+                            {
+                                ValueFieldCallback(e);
+                            }
+                            else
+                            {
+                                ushortField.SetValueWithoutNotify(e.previousValue);
+                            }
+                        });
+                        valueField = ushortField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedUByte:
+                        UnsignedIntegerField byteField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedUByte(), 
+                            isDelayed = true,
+                        };
+                        byteField.RegisterValueChangedCallback(e =>
+                        {
+                            if (e.newValue <= byte.MaxValue)
+                            {
+                                ValueFieldCallback(e);
+                            }
+                            else
+                            {
+                                byteField.SetValueWithoutNotify(e.previousValue);
+                            }
+                        });
+                        valueField = byteField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedUInt:
+                        UnsignedIntegerField uintField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedUInt(), 
+                            isDelayed = true,
+                        };
+                        uintField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = uintField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedULong:
+                        UnsignedLongField ulongField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedULong(), 
+                            isDelayed = true,
+                        };
+                        ulongField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = ulongField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedDouble:
+                        DoubleField doubleField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedDouble(), 
+                            isDelayed = true,
+                        };
+                        doubleField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = doubleField;
+                        break;
+                    
+                    case ClientSimPlayerDataType.WrappedLong:
+                        LongField longField = new()
+                        {
+                            label = kvp.Key, 
+                            value = kvp.Value.Value.AsWrappedLong(), 
+                            isDelayed = true,
+                        };
+                        longField.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = longField;
+                        break;
+                    
+                    default:
+                        TextField field = new()
+                        {
+                            label = kvp.Key, 
+                            value = Truncate(false, kvp.Value.Value.Value.ToString()),
+                            isDelayed = true,
+                            maxLength = MAX_LENGTH_SINGLE_LINE
+                        };
+                        field.RegisterValueChangedCallback(ValueFieldCallback);
+                        valueField = field;
+                        break;
+                }
+                
+                labelContainer.Add(valueField);
+                continue;
+
+                // truncate a value
+                string Truncate(bool isMultiline, string value)
+                {
+                    const string end = "... (truncated)";
+                    int maxLength = isMultiline ? MAX_LENGTH_MULTI_LINE : MAX_LENGTH_SINGLE_LINE;
+                    return value.Length > maxLength 
+                        ? $"{value.Truncate(maxLength - end.Length)}{end}" 
+                        : value;
+                }
+                
+                // in play mode, set value through PlayerData interface
+                // in edit mode, update the JSON directly
+                void ValueFieldCallback<T>(ChangeEvent<T> evt)
+                {
+                    ClientSimPlayerDataTypeUnion typeUnion = new ClientSimPlayerDataTypeUnion
+                    {
+                        Type = kvp.Value.Value.Type,
+                        Value = evt.newValue
+                    };
+                    
+                    // quaternions are displayed as Vector3 eulers
+                    if (kvp.Value.Value.Type == ClientSimPlayerDataType.Quaternion && evt.newValue is Vector3 eulers)
+                    {
+                        typeUnion.Value = Quaternion.Euler(eulers);
+                    }
+                    
+                    // color32s are displayed as colors
+                    if (kvp.Value.Value.Type == ClientSimPlayerDataType.Color32 && evt.newValue is Color color)
+                    {
+                        typeUnion.Value = (Color32)color;
+                    }
+
+                    // bytes are displayed ints
+                    if (kvp.Value.Value.Type == ClientSimPlayerDataType.WrappedUByte)
+                    {
+                        typeUnion.Value = Convert.ToByte(evt.newValue);
+                    }
+                    if (kvp.Value.Value.Type == ClientSimPlayerDataType.WrappedByte)
+                    {
+                        typeUnion.Value = Convert.ToSByte(evt.newValue);
+                    }
+                    
+                    ClientSimPlayerDataPair dataPair = new() { Key = kvp.Key, Value = typeUnion };
+                    
+                    if (EditorApplication.isPlaying)
+                    {
+                        SetData(dataPair, player);
+                    }
+                    
+                    else
+                    {
+                        string json = File.ReadAllText(LocalPlayerDataPath);
+                        var data = JsonConvert.DeserializeObject<Dictionary<string, ClientSimPlayerDataPair>>(json);
+                        data[kvp.Key] = dataPair;
+                        json = JsonConvert.SerializeObject(data, Formatting.Indented);
+                        File.WriteAllText(LocalPlayerDataPath, json);
+                        
+                        // After serializing the new value, reload it into ClientSim PlayerData and refresh the UI.
+                        
+                        // Note: Color fields lack an isDelayed property and serialize every frame during editing.
+                        // Rebuilding the UI while a User edits a color will break the field's update loop.
+                        // To avoid this, we update ClientSim PlayerData directly and skip the UI rebuild.
+                        // If the user has sorted fields by "Last Updated", the color field will not sort to the top from this.
+                        if (kvp.Value.Value.Type is ClientSimPlayerDataType.Color or ClientSimPlayerDataType.Color32)
+                        {
+                            UpdatePlayerDataList(data, player, false);
+                        }
+                        else
+                        {
+                            UpdatePlayerDataList(data, player);
+                        }
+                    }
+                }
+
+                // is there a better way to find all FloatField children and their immediate parent? 
+                void SetIsDelayedForCompositeField(VisualElement compositeField)
+                {
+                    VisualElement container = compositeField.contentContainer.Children().ToList()[1];
+                    container.style.flexShrink = 1;
+                    foreach (var child in container.Children())
+                    {
+                        if (child is FloatField f)
+                        {
+                            f.isDelayed = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        private void RefreshPlayerData()
+        {
+            if (!EditorApplication.isPlaying)
+            {
+                LoadPlayerData();
+            }
+            else
+            {
+                foreach (var player in VRCPlayerApi.AllPlayers)
+                {
+                    player.GetClientSimPlayer().PlayerDataObject.Decode(false);
+                }
+            }
+        }
+        
+        private static void OpenLocalDataDirectory()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                Process.Start("explorer.exe", LocalPlayerDataRoot.Replace("/", "\\"));
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                Process.Start("open", LocalPlayerDataRoot);
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                Process.Start("xdg-open", LocalPlayerDataRoot);
+            }
+        }
+        
+        private void ClearPlayerData()
+        {
+            StringBuilder clearedFiles = new StringBuilder("Cleared PlayerData files:");
+            string[] playerDataFiles = Directory.GetFiles(LocalPlayerDataRoot, LocalDataPathPattern);
+            foreach (var file in playerDataFiles)
+            {
+                File.Delete(file);
+                clearedFiles.Append($"\n\t{file}");
+
+                // in play mode, let other systems know PlayerData was cleared
+                if (EditorApplication.isPlaying)
+                {
+                    string playerId = file.Split("_")[1].Split(".")[0];
+                    int id = int.Parse(playerId);
+                    var player = VRCPlayerApi.GetPlayerById(id);
+                    {
+                        eventDispatcher.SendEvent(new ClientSimOnPlayerDataClearedEvent { player = player });
+                    }
+                }
+
+                hasLocalPlayerData = false;
+                if (!isLocalPlayerSelected)
+                {
+                    addRemotePlayerTestDataButton.style.display = DisplayStyle.None;
+                }
+                
+                CheckDataEmpty();
+            }
+
+            page = 0;
+            numPages = 0;
+            UpdatePage();
+
+            if (playerDataFiles.Length > 0)
+            {
+                this.Log(clearedFiles.ToString());
+            }
+        }
+
+        private void NextPage()
+        {
+            page++;
+            UpdatePage();
+        }
+
+        private void PreviousPage()
+        {
+            page--;
+            UpdatePage();   
+        }
+
+        private void UpdatePage(bool reload = true)
+        { 
+            bool isFirstPage = page == 0;
+            bool isLastPage = page == numPages - 1;
+
+            prevPageButton.SetEnabled(!isFirstPage);
+            nextPageButton.SetEnabled(!isLastPage);
+
+            pageLabel.text = $"{page+1} / {numPages}";
+            if (reload)
+            {
+                LoadPlayerDataForSelectedPlayer();
+            }
+        }
+
+        private bool CheckDataEmpty(int numPlayerData = 0)
+        {
+            bool isEmpty = numPlayerData == 0;
+            clearDataButton.SetEnabled(!isEmpty);
+            noDataInfoContainer.style.display = isEmpty ? DisplayStyle.Flex : DisplayStyle.None;
+            sortDropdown.style.display = isEmpty ? DisplayStyle.None : DisplayStyle.Flex;
+            pagingContainer.style.display = numPlayerData > PAGE_SIZE ? DisplayStyle.Flex : DisplayStyle.None;
+            labelContainer.Clear();
+            return isEmpty;
+        }
+
+        private void CheckLocalPlayerName()
+        {
+            localPlayerName = string.IsNullOrEmpty(ClientSimSettings.Instance.customLocalPlayerName)
+                ? "[1] Local Player"
+                : ClientSimSettings.Instance.customLocalPlayerName;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Editor/Windows/ClientSimPlayerDataWindow.cs.meta b/Source/Editor/Windows/ClientSimPlayerDataWindow.cs.meta
new file mode 100644
index 0000000..b6d0dc9
--- /dev/null
+++ b/Source/Editor/Windows/ClientSimPlayerDataWindow.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4b21b5684b10448b9b0a445cfc16fcfd
+timeCreated: 1709067526
\ No newline at end of file
diff --git a/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs b/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs
new file mode 100644
index 0000000..429d7b4
--- /dev/null
+++ b/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs
@@ -0,0 +1,319 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Editor.VisualElements;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDKBase;
+
+namespace VRC.SDK3.ClientSim.Editor
+{
+    #if VRC_ENABLE_PLAYER_PERSISTENCE
+    public class ClientSimPlayerObjectWindow : EditorWindow
+    {
+        
+        private Dictionary<int, List<PlayerObjectData>> playerObjects = new Dictionary<int, List<PlayerObjectData>>();
+        private List<ClientSimNetworkHolderInstanceElement> playerObjectVisualElements = new List<ClientSimNetworkHolderInstanceElement>();
+        private List<VRCPlayerApi> players = new List<VRCPlayerApi>();
+        private IClientSimEventDispatcher eventDispatcher;
+        
+        private DropdownField playerDropdown;
+        private DropdownField Sort;
+        private Label pageLabel;
+        private Button nextPage;
+        private Button prevPage;
+        private TextField searchField;
+        private ScrollView playerDataList;
+        private VisualElement HelpBox;
+        private Label HelpBoxLabel;
+        
+        private int CurrentIndex = 0;
+        private int CurrentSelectedPlayerID = -1;
+        private static int CountPerPage = 10;
+        private static string HelpTextEnterPlayMode = "Enter Play Mode to view PlayerObjects";
+        
+        private enum SortingMode
+        {
+            Alphabetical,
+            LastModified
+        }
+        
+        private SortingMode _sortingMode = SortingMode.Alphabetical;
+        
+        [MenuItem("VRChat SDK/ClientSim PlayerObjects", false, 1500)]
+        public static void Init()
+        {
+            var window = GetWindow<ClientSimPlayerObjectWindow>(false, "ClientSim PlayerObjects");
+            window.minSize = new Vector2(400, 400);
+            window.Show();
+        }
+
+        public void OnEnable()
+        {
+            VisualElement root = rootVisualElement;
+            VisualTreeAsset visualTree = Resources.Load<VisualTreeAsset>(nameof(ClientSimPlayerObjectWindow));
+            visualTree.CloneTree(root);
+            
+            playerDropdown = root.Q<DropdownField>("PlayerDropdown");
+            playerDropdown.choices = new List<string>();
+            playerDropdown.RegisterValueChangedCallback((evt) =>
+            {
+                CurrentSelectedPlayerID = players[playerDropdown.index].playerId;
+                CurrentIndex = 0;
+                pageLabel.text = "Page 0";
+                UpdateCurrentPage(null);
+            });
+            
+            Sort = root.Q<DropdownField>("Sort");
+            Sort.choices = new List<string>()
+            {
+                "Alphabetical",
+                "Last modified"
+            };
+            Sort.SetValueWithoutNotify("Alphabetical");
+            
+            Sort.RegisterValueChangedCallback(OnChangeSortingMode);
+            _sortingMode = SortingMode.Alphabetical;
+            
+            searchField = root.Q<TextField>("Search");
+            searchField.RegisterValueChangedCallback((evt) =>
+            {
+                UpdateCurrentPage(null);
+            });
+            
+            playerDataList = root.Q<ScrollView>("PlayerObjectList");
+            
+            nextPage = root.Q<Button>("Right");
+            nextPage.clicked += NextPage;
+            nextPage.style.display = DisplayStyle.None;
+            
+            prevPage = root.Q<Button>("Left");
+            prevPage.clicked += PreviousPage;
+            prevPage.style.display = DisplayStyle.None;
+            
+            pageLabel = root.Q<Label>("PagingLabel");
+            pageLabel.text = "Page 1";
+            
+            HelpBox = root.Q<VisualElement>("HelpTextBox");
+            HelpBoxLabel = HelpBox.Q<Label>("HelpTextBoxLabel");
+            HelpBoxLabel.text = HelpTextEnterPlayMode;
+            
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+            if (EditorApplication.isPlaying)
+            {
+                OnPlayModeStateChanged(PlayModeStateChange.EnteredPlayMode);
+            }
+            
+            VRCPlayerApi[] newplayers = new VRCPlayerApi[VRCPlayerApi.GetPlayerCount()];
+            newplayers = VRCPlayerApi.GetPlayers(newplayers);
+
+            foreach (VRCPlayerApi player in newplayers)
+            {
+                ClientSimOnPlayerJoinedEvent playerJoinedEvent = new ClientSimOnPlayerJoinedEvent();
+                playerJoinedEvent.player = player;
+                OnPlayerJoined(playerJoinedEvent);
+            }
+            
+            for(int i = 0; i < CountPerPage; i++)
+            {
+                ClientSimNetworkHolderInstanceElement element = new ClientSimNetworkHolderInstanceElement();
+                playerObjectVisualElements.Add(element);
+                playerDataList.Add(element);
+                element.style.display = DisplayStyle.None;
+            }
+            
+        }
+        
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.EnteredPlayMode)
+            {
+                eventDispatcher = ClientSimMain.GetInstance().GetEventDispatcher();
+                eventDispatcher.Subscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+                eventDispatcher.Subscribe<ClientSimOnPlayerObjectUpdateEndedEvent>(UpdateCurrentPage);
+                eventDispatcher.Subscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+                eventDispatcher.Subscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
+                
+                nextPage.style.display = DisplayStyle.Flex;
+                HelpBox.style.display = DisplayStyle.None;
+            }
+            else if (state == PlayModeStateChange.ExitingPlayMode)
+            {
+                playerDropdown.choices.RemoveRange(1, playerDropdown.choices.Count - 1);
+                playerDropdown.index = 0;
+                
+                playerDataList.Clear();
+                CurrentIndex = 0;
+                CurrentSelectedPlayerID = -1;
+                
+                nextPage.style.display = DisplayStyle.None;
+                prevPage.style.display = DisplayStyle.None;
+                
+                HelpBox.style.display = DisplayStyle.Flex;
+
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerObjectUpdatedEvent>(OnPlayerObjectUpdated);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerObjectUpdateEndedEvent>(UpdateCurrentPage);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+                eventDispatcher?.Unsubscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
+                eventDispatcher = null;
+            }
+        }
+
+        private void OnChangeSortingMode(ChangeEvent<string> evt)
+        {
+            if (evt.newValue == "Alphabetical")
+            {
+                playerObjects[CurrentSelectedPlayerID].Sort( (x, y) => string.Compare(x.Name, y.Name) );
+                _sortingMode = SortingMode.Alphabetical;
+            }
+            else if (evt.newValue == "Last modified")
+            {
+                _sortingMode = SortingMode.LastModified;
+                playerObjects[CurrentSelectedPlayerID].Sort( (x, y) => x.lastModified.CompareTo(y.lastModified) );
+            }
+        }
+        
+        private void NextPage()
+        {
+            CurrentIndex += CountPerPage;
+            pageLabel.text = "Page " + (CurrentIndex / CountPerPage + 1);
+            if(CurrentIndex+CountPerPage > playerObjects[CurrentSelectedPlayerID].Count)
+                nextPage.style.display = DisplayStyle.None;
+            else
+            {
+                nextPage.style.display = DisplayStyle.Flex;
+                prevPage.style.display = DisplayStyle.Flex;
+            }
+        }
+        
+        private void PreviousPage()
+        {
+            CurrentIndex -= CountPerPage;
+            pageLabel.text = "Page " + (CurrentIndex / CountPerPage + 1);
+            
+            if(CurrentIndex <= 0)
+                prevPage.style.display = DisplayStyle.None;
+            else
+            {
+                prevPage.style.display = DisplayStyle.Flex;
+                nextPage.style.display = DisplayStyle.Flex;
+            }
+        }
+
+        private void OnPlayerObjectUpdated(ClientSimOnPlayerObjectUpdatedEvent payload)
+        {
+            int playerId = payload.Data.GetPlayerId();
+            if(playerObjects.TryGetValue(playerId, out var instanceElements))
+            {
+                int index = instanceElements.FindIndex((x) => x.NetworkView == payload.Data);
+                if (index == -1)
+                {
+                    AddElementToList(payload);
+                }
+                
+            } else {
+                playerObjects[playerId] = new List<PlayerObjectData>();
+                AddElementToList(payload);
+            }
+        }
+
+        private void AddElementToList(ClientSimOnPlayerObjectUpdatedEvent payload)
+        {
+            int componentCount = payload.Data.GetNetworkComponentCount();
+            int playerId = payload.Data.GetPlayerId();
+            for (int i = 0; i < componentCount; i++)
+            {
+                MonoBehaviour component = payload.Data.GetNetworkComponents()[i];
+                
+                PlayerObjectData element =
+                    new PlayerObjectData
+                    {
+                        NetworkView = payload.Data,
+                        lastModified = DateTime.Now,
+                        Name = $"{component.GetType().Name} ({component.gameObject.name})",
+                    };
+                
+                playerObjects[playerId].Add(element);
+            }
+        }
+        
+        private void UpdateCurrentPage(ClientSimOnPlayerObjectUpdateEndedEvent e)
+        {
+            if(playerObjects.Count == 0 || CurrentSelectedPlayerID == -1)
+                return;
+            
+            int index = CurrentIndex;
+            int count = playerObjects[CurrentSelectedPlayerID].Count;
+            int localIndex = 0;
+            for (; index < count;)
+            {
+                PlayerObjectData element = playerObjects[CurrentSelectedPlayerID][index];
+                if(searchField.value != "" && !element.Name.Contains(searchField.value))
+                {
+                    index++;
+                    continue;
+                }
+                
+                playerObjectVisualElements[localIndex].UpdateData(element);
+                
+                localIndex++;
+                if(localIndex >= CountPerPage)
+                    break;
+                
+                index++;
+            }
+            
+            for (int i = localIndex; i < playerObjectVisualElements.Count; i++)
+            {
+                playerObjectVisualElements[i].style.display = DisplayStyle.None;
+            }
+            
+            prevPage.style.display = CurrentIndex - CountPerPage < 0 ? DisplayStyle.None : DisplayStyle.Flex;
+            nextPage.style.display = CurrentIndex + CountPerPage >= count ? DisplayStyle.None : DisplayStyle.Flex;
+            
+            pageLabel.style.display = prevPage.style.display == DisplayStyle.None && nextPage.style.display == DisplayStyle.None ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+
+        private void OnPlayerJoined(ClientSimOnPlayerJoinedEvent payload)
+        {
+            if (players.Contains(payload.player)) return;
+            
+            if(playerObjects.ContainsKey(payload.player.playerId) == false)
+                playerObjects.Add(payload.player.playerId, new List<PlayerObjectData>());
+            playerDropdown.choices.Add(payload.player.displayName);
+            players.Add(payload.player);
+            if (CurrentSelectedPlayerID == -1)
+            {
+                playerDropdown.index = 0;
+                CurrentSelectedPlayerID = payload.player.playerId;
+            }
+        }
+        
+        private void OnPlayerLeft(ClientSimOnPlayerLeftEvent payload)
+        {
+            if (!playerObjects.ContainsKey(payload.player.playerId)) return;
+            
+            playerObjects.Remove(payload.player.playerId);
+            players.Remove(payload.player);
+            playerDropdown.choices.Remove(playerDropdown.choices.Find(x => x == payload.player.displayName));
+            if (CurrentSelectedPlayerID == payload.player.playerId)
+            {
+                playerDropdown.index = 0;
+                CurrentSelectedPlayerID = players[0].playerId;
+            }
+        }
+
+
+        public struct PlayerObjectData
+        {
+            public IClientSimNetworkSerializer NetworkView;
+            public DateTime lastModified;
+            public string Name;
+            public int index;
+        }
+    }
+
+#endif
+}
\ No newline at end of file
diff --git a/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs.meta b/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs.meta
new file mode 100644
index 0000000..d4ebd5d
--- /dev/null
+++ b/Source/Editor/Windows/ClientSimPlayerObjectWindow.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 780b242d9ac449059aaf28150bd5a6ef
+timeCreated: 1715609826
\ No newline at end of file
diff --git a/Source/Editor/Windows/ClientSimSettingsWindow.cs b/Source/Editor/Windows/ClientSimSettingsWindow.cs
index 364e4be..474f413 100644
--- a/Source/Editor/Windows/ClientSimSettingsWindow.cs
+++ b/Source/Editor/Windows/ClientSimSettingsWindow.cs
@@ -29,13 +29,13 @@ public class ClientSimSettingsWindow : EditorWindow
         private readonly GUIContent _showDesktopReticleGuiContent = new GUIContent("Show Desktop Reticle", "Show or hide the center Desktop reticle image.");
         private readonly GUIContent _showTooltipsGuiContent = new GUIContent("Show Tooltips", "If enabled, hovering over an interactable object or pickup will display a tooltip above the object.");
         private readonly GUIContent _invertMouseLookGuiContent = new GUIContent("Invert Mouse Look", "If enabled, moving the mouse up or down will invert the direction the player will look up and down.");
-        private readonly GUIContent _playerHeightGuiContent = new GUIContent("Initial Player Height", "How tall should the player be in meters at app start. Default height is 1.9. Note that the player's collision capsule is 1.6 and never changes.");
-        private readonly GUIContent _currentLanguageGuiContent = new GUIContent("Current Language", "The language the player is currently using. Available languages include English, French, German, Italian, Japanese, Korean, and Spanish.");
         private int selectedLanguageIndex;
         
         // Player settings
         private readonly GUIContent _playerButtonsFoldoutGuiContent = new GUIContent("Player Settings", "");
         private readonly GUIContent _localPlayerCustomNameGuiContent = new GUIContent("Local Player Name", "Set a custom name for the local player. Useful for testing udon script name detection");
+        private readonly GUIContent _playerHeightGuiContent = new GUIContent("Initial Player Height", "How tall should the player be in meters at app start. Default height is 1.9. Note that the player's collision capsule is 1.6 and never changes.");
+        private readonly GUIContent _currentLanguageGuiContent = new GUIContent("Current Language", "The language the player is currently using.");
         private readonly GUIContent _isMasterGuiContent = new GUIContent("Local Player Is Master", "Set whether the local player starts off as the master of the instance. Setting this to false and starting Client Sim will spawn a remote player before the local player.");
         private readonly GUIContent _isInstanceOwnerGuiContent = new GUIContent("Is Instance Owner", "Set whether the local player is considered the instance owner");
         private readonly GUIContent _remotePlayerCustomNameGuiContent = new GUIContent("Remote Player Name", "Set a custom name for the next spawned remote player. Useful for testing udon script name detection");
@@ -61,7 +61,7 @@ public class ClientSimSettingsWindow : EditorWindow
         private bool _needsAudioSetup = false;
         private bool _needsLayerSetup = false;
 
-        [MenuItem("VRChat SDK/Utilities/ClientSim")]
+        [MenuItem("VRChat SDK/ClientSim", false, 1500)]
         public static void Init()
         {
             ClientSimSettingsWindow window = GetWindow<ClientSimSettingsWindow>(false, "ClientSim Settings");
@@ -383,9 +383,6 @@ private void DrawPlayerControllerSettings()
                 _settings.showDesktopReticle = EditorGUILayout.Toggle(_showDesktopReticleGuiContent, _settings.showDesktopReticle);
                 _settings.showTooltips = EditorGUILayout.Toggle(_showTooltipsGuiContent, _settings.showTooltips);
                 _settings.invertMouseLook = EditorGUILayout.Toggle(_invertMouseLookGuiContent, _settings.invertMouseLook);
-                _settings.playerStartHeight = EditorGUILayout.FloatField(_playerHeightGuiContent, _settings.playerStartHeight);
-                selectedLanguageIndex = EditorGUILayout.Popup(_currentLanguageGuiContent, selectedLanguageIndex, _settings.GetAvailableDisplayLanguages());
-                _settings.currentLanguage = _settings.GetLanguage(selectedLanguageIndex);
 
                 EditorGUI.EndDisabledGroup();
 
@@ -410,6 +407,9 @@ private void DrawPlayerButtons()
                 EditorGUI.BeginDisabledGroup(hasInstance || Application.isPlaying);
                 
                 _settings.customLocalPlayerName = EditorGUILayout.TextField(_localPlayerCustomNameGuiContent, _settings.customLocalPlayerName);
+                _settings.playerStartHeight = EditorGUILayout.FloatField(_playerHeightGuiContent, _settings.playerStartHeight);
+                selectedLanguageIndex = EditorGUILayout.Popup(_currentLanguageGuiContent, selectedLanguageIndex, _settings.GetAvailableDisplayLanguages());
+                _settings.currentLanguage = _settings.GetLanguage(selectedLanguageIndex);
                 _settings.localPlayerIsMaster = EditorGUILayout.Toggle(_isMasterGuiContent, _settings.localPlayerIsMaster);
                 _settings.isInstanceOwner = EditorGUILayout.Toggle(_isInstanceOwnerGuiContent, _settings.isInstanceOwner);
                 
@@ -443,6 +443,14 @@ private void DrawPlayerButtons()
                         {
                             playersToRemove.Add(player);
                         }
+                        
+                        EditorGUI.EndDisabledGroup();
+                        EditorGUI.BeginDisabledGroup(VRCPlayerApi.AllPlayers.Count == 1);
+
+                        if (GUILayout.Button("Simulate VRC+ Gift"))
+                        {
+                            player.GetClientSimPlayer().SimulateVRCPlusGift();
+                        }
 
                         EditorGUI.EndDisabledGroup();
 
diff --git a/Source/README.md b/Source/README.md
deleted file mode 100644
index 22af036..0000000
--- a/Source/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# ClientSim
-## A VRChat Client Simulator for building Worlds
-
-This tool enables you to test your VRChat SDK3 Worlds directly in Unity! You can look at the state of all objects to verify things directly.
-
-## Features
-
-- Debug everything in Unity.
-- Inspect Udon variables in Play Mode.
-- Desktop player controller.
-- Grab Pickups, use Interacts, UI and Stations.
-- Delete EditorOnly objects on Play.
-
-### New Features in ClientSim
-- Pickup manipulation through I, J, K, L, U, O, mouse scrolling and gamepad.
-- Input based on keyboard layout isntead of specific keys.
-- Local and Remote player now have humanoid avatars, avatar bones supported (but not full Avatar systems).
-- View and set player data directly - Locomotion values, voice and avatar audio settings, combat health.
-- Unlock mouse by holding tab - you can highlight off-center objects this way.
-- Pointer displays when a UI element can be interacted with.
-- New runtime options: start as non-master, invert mouse, show tooltips, change player scale, set target framerate, delay start to simulate loading.
-- New playmode menu with updated style, player info and settings buttons.
-- New buttons in the Settings Window to update Project Settings, no longer happens without user consent.
-- Mesh highlighting that matches Android.
-- Tooltip location updated to match client.
-- Better gamepad support.
-- Support for Disabled Domain Reload to enter playmode without delay - note that there is a Unity bug that causes UI Events to fail if they're not set to "Editor and Runtime".
-- Automated Testing - you need to specifically enable this so it won't affect your project. Documentation forthcoming.
-
-### Known Issues
-
-- Manually changing Unity Project settings to enable the new input system may not properly allow input. Users should use the buttons in the ClientSim Settings Window.
-- Physics.RaycastNonAlloc sometimes does not return colliders that have moved and do not have rigidbodies.
-- On exiting playmode may throw exceptions occasionally due to order in which objects are destroyed.
-- Highlight shader does not work on Mac (Metal).
-
-## Setup
-
-### Requirements
-
-- Unity 2019.4.29-31
-- Package versions of [VRChat Base](https://github.com/vrchat/packages/tree/main/packages/com.vrchat.base) and [Worlds](https://github.com/vrchat/packages/tree/main/packages/com.vrchat.worlds) SDKs
-
-### Installing
-
-- Use the [VRChat Creator Companion](https://vcc.docs.vrchat.com) to add the package to your project from the 'Curated Packages' section
-
-### Getting started
-
-- Open your VRChat world scene
-- Press play in Unity
-- Test your world
-
-## Copyright
-
-Copyright (c) 2023 VRChat
-See License.md for full usage information
-
-## Credits
-
-Based on [CyanEmu](https://github.com/CyanLaser/CyanEmu) by [CyanLaser](https://github.com/CyanLaser), who also made this version.
diff --git a/Source/Runtime/ClientSimRuntimeLoader.cs b/Source/Runtime/ClientSimRuntimeLoader.cs
index bd18651..df73562 100644
--- a/Source/Runtime/ClientSimRuntimeLoader.cs
+++ b/Source/Runtime/ClientSimRuntimeLoader.cs
@@ -29,6 +29,10 @@ private static void OnAfterSceneLoad()
         {
             // Delete all editor only objects before creating ClientSim.
             DestroyEditorOnly(GetSettings());
+            
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+            ClientSimMain.GetInstance().EnablePlayerObjects();
+#endif
         }
 
         #endregion
diff --git a/Source/Runtime/Events/EventTypes/ClientSimOnPlayerEvents.cs b/Source/Runtime/Events/EventTypes/ClientSimOnPlayerEvents.cs
index 183b2f2..c2fefa6 100644
--- a/Source/Runtime/Events/EventTypes/ClientSimOnPlayerEvents.cs
+++ b/Source/Runtime/Events/EventTypes/ClientSimOnPlayerEvents.cs
@@ -1,4 +1,10 @@
-using VRC.SDKBase;
+using System.Collections.Generic;
+using VRC.SDKBase;
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.ClientSim.Persistence;
+#endif
 
 namespace VRC.SDK3.ClientSim
 {
@@ -57,8 +63,51 @@ public class ClientSimOnNewMasterEvent : IClientSimEvent
         public VRCPlayerApi newMasterPlayer;
     }
     
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+    public class ClientSimOnPlayerDataDecodedEvent : IClientSimEvent
+    {
+        public VRCPlayerApi player;
+    }
+    
+    public class ClientSimOnPlayerObjectsDecodedEvent : IClientSimEvent
+    {
+        public VRCPlayerApi player;
+    }
+    
+    public class ClientSimOnPlayerRestoredEvent : IClientSimEvent
+    {
+        public VRCPlayerApi player;
+    }
+    
+    public class ClientSimOnPlayerDataUpdatedEvent : IClientSimEvent
+    {
+        public VRCPlayerApi player;
+        public Dictionary<string, ClientSimPlayerDataPair> playerData;
+    }
+    
+    public class ClientSimOnPlayerDataClearedEvent : IClientSimEvent
+    {
+        public VRCPlayerApi player;
+    }
+    
+    public class ClientSimOnPlayerObjectUpdatedEvent : IClientSimEvent
+    {
+        public IClientSimNetworkSerializer Data;
+    }
+    
+    public class ClientSimOnPlayerObjectUpdateEndedEvent : IClientSimEvent
+    {
+    }
+#endif
+
     public class ClientSimOnToggleManualScalingEvent : IClientSimEvent
     {
         public bool manualScalingAllowed;
     }
+
+    public class ClientSimOnVRCPlusMassGift : IClientSimEvent
+    {
+        public VRCPlayerApi gifter;
+        public int numGifts;
+    }
 }
\ No newline at end of file
diff --git a/Source/Runtime/Helpers/ClientSimPositionSyncedHelperBase.cs b/Source/Runtime/Helpers/ClientSimPositionSyncedHelperBase.cs
index 1f83fe8..0ec8dcf 100644
--- a/Source/Runtime/Helpers/ClientSimPositionSyncedHelperBase.cs
+++ b/Source/Runtime/Helpers/ClientSimPositionSyncedHelperBase.cs
@@ -11,7 +11,6 @@ public abstract class ClientSimPositionSyncedHelperBase :
         IClientSimRespawnHandler
     {
         private int _ownerID = 1;
-
         private Vector3 _originalPosition;
         private Quaternion _originalRotation;
 
diff --git a/Source/Runtime/Networking.meta b/Source/Runtime/Networking.meta
new file mode 100644
index 0000000..10ee1ad
--- /dev/null
+++ b/Source/Runtime/Networking.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c1fb020477f14d7bb93e62a609f90103
+timeCreated: 1709653505
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkEventSending.cs b/Source/Runtime/Networking/ClientSimNetworkEventSending.cs
new file mode 100644
index 0000000..1215e93
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkEventSending.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using VRC.SDK3.ClientSim.Persistence;
+using VRC.Udon;
+using VRC.Udon.Common;
+
+namespace VRC.SDK3.ClientSim
+{
+    public class ClientSimNetworkEventSending
+    {
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+        private static ClientSimNetworkEventSending _instance;
+        
+        public static ClientSimNetworkEventSending Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new ClientSimNetworkEventSending();
+                }
+
+                return _instance;
+            }
+        }
+        
+        private CancellationTokenSource _cancellationTokenSource;
+        
+        private Dictionary<ClientSimPlayerObjectStorage,List<UdonBehaviour>> _RequestedObjects = new Dictionary<ClientSimPlayerObjectStorage,List<UdonBehaviour>>();
+        
+        private const int TIME_BETWEEN_EVENTS = 50;
+        
+        private ClientSimNetworkEventSending()
+        {
+            _cancellationTokenSource = new CancellationTokenSource();
+            SendNetworkEvents().Forget();
+        }
+        
+        ~ClientSimNetworkEventSending()
+        {
+            _cancellationTokenSource.Cancel();
+        }
+        
+        public void QueueRequest(UdonBehaviour udonBehaviour, ClientSimPlayerObjectStorage playerObjectStorage)
+        {
+            if(!_RequestedObjects.ContainsKey(playerObjectStorage)){
+                List<UdonBehaviour> udonBehaviours = new List<UdonBehaviour>();
+                udonBehaviours.Add(udonBehaviour);
+                _RequestedObjects[playerObjectStorage] = udonBehaviours;
+            }
+            else
+            {
+                if(!_RequestedObjects[playerObjectStorage].Contains(udonBehaviour))
+                    _RequestedObjects[playerObjectStorage].Add(udonBehaviour);
+            }
+        }
+
+        private async UniTask SendNetworkEvents()
+        {
+            UniTask.SwitchToMainThread();
+            
+            while (!_cancellationTokenSource.IsCancellationRequested)
+            {
+                await UniTask.Delay(TIME_BETWEEN_EVENTS, cancellationToken: _cancellationTokenSource.Token);
+
+                List<ClientSimPlayerObjectStorage> keys = _RequestedObjects.Keys.ToList();
+                
+                for (int i = keys.Count-1; i >= 0; i--)
+                {
+                    ClientSimPlayerObjectStorage storage = keys[i];
+                    List<UdonBehaviour> udonBehaviours = _RequestedObjects[storage];
+                    for (int j = udonBehaviours.Count-1; j >= 0; j--)
+                    {
+                        storage.Encode(udonBehaviours[j].gameObject);
+                    }
+                }
+                
+                _RequestedObjects.Clear();
+            }
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkEventSending.cs.meta b/Source/Runtime/Networking/ClientSimNetworkEventSending.cs.meta
new file mode 100644
index 0000000..63373ba
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkEventSending.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7aec0ce478dd45e3b123829428887c09
+timeCreated: 1712850919
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs b/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs
new file mode 100644
index 0000000..41caff3
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs
@@ -0,0 +1,204 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using VRC.SDK3.ClientSim.EncodeDecoders;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Components;
+using VRC.SDK3.Data;
+using VRC.SDKBase;
+using VRC.Udon;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+namespace VRC.SDK3.ClientSim
+{
+    public class ClientSimNetworkIdHolder : ClientSimBehaviour, IClientSimNetworkSerializer
+    {
+        internal ClientSimNetworkingView _networkId;
+        internal DataList _data = new DataList();
+        private bool IsManual = false;
+        
+        private bool _isInitialized;
+        
+        internal  List<MonoBehaviour> _components;
+        internal static Dictionary<string,IClientSimEncodeDecoder> encodeDecoders = new Dictionary<string,IClientSimEncodeDecoder>
+        {
+            { typeof(VRCObjectSync).FullName, new ClientSimObjectSyncEncodeDecoder() },
+            { typeof(UdonBehaviour).FullName, new ClientSimUdonEncodeDecode() },
+            { typeof(VRCObjectPool).FullName, new ClientSimObjectPoolEncodeDecode()}
+        };
+        
+        public void SetNetworkView(ClientSimNetworkingView networkId)
+        {
+            _networkId = networkId;
+        }
+
+        public ClientSimNetworkingView GetNetworkView()
+        {
+            return _networkId;
+        }
+
+        public int GetPlayerId()
+        {
+            return _networkId.GetPlayerId();
+        }
+
+        public void SetNetworkComponents()
+        {
+            _components = new List<MonoBehaviour>();
+            MonoBehaviour[] allComponents = GetComponents<MonoBehaviour>();
+            IsManual = true;
+            for (int i =0; i < allComponents.Length;i++)
+            {
+                if (encodeDecoders.ContainsKey(allComponents[i].GetType().FullName))    
+                {
+                    if (allComponents[i].GetType() == typeof(UdonBehaviour))
+                    {
+                        if (((UdonBehaviour)allComponents[i]).SyncMethod == Networking.SyncType.None)
+                            continue;
+                    }
+
+                    IsManual = IsManual && encodeDecoders[allComponents[i].GetType().FullName].IsManualSynced(allComponents[i]);
+                    _components.Add(allComponents[i]);
+                }
+            }
+        }
+        
+        public bool IsDirty(GameObject gameObject = null)
+        {
+            if(this == null)
+                return false;
+            
+            if(gameObject != null)
+                if(gameObject != this.gameObject)
+                    return false;
+            
+            if(IsManual && gameObject == null)
+                return false;
+            
+            if(_data.Count < _components.Count)
+                return true;
+            
+            for(int i = 0; i < _components.Count;i++)
+            {
+                string componentType = _components[i].GetType().FullName;
+                if (encodeDecoders.TryGetValue(componentType, out var encodeDecoder))
+                {
+                    if(encodeDecoder.IsDirty(_components[i], _data[i].DataDictionary))
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        public DataList Encode(GameObject gameObject = null)
+        {
+            if(gameObject != null)
+                if (gameObject != this.gameObject)
+                    return _data;
+
+            if (IsManual && gameObject == null)
+                return _data;
+
+            _data ??= new DataList();
+            for(int i = 0; i < _components.Count;i++)
+            {
+                string componentType = _components[i].GetType().FullName;
+                if (encodeDecoders.TryGetValue(componentType, out var encodeDecoder))
+                {
+                    if(_data.Count > i)
+                        _data[i] = encodeDecoder.Encode(_components[i]);
+                    else
+                    {
+                        _data.Add(encodeDecoder.Encode(_components[i]));
+                    }
+                }
+            }
+            #if VRC_ENABLE_PLAYER_PERSISTENCE
+            ClientSimMain.GetInstance().GetEventDispatcher().SendEvent(new ClientSimOnPlayerObjectUpdatedEvent{Data = this});
+            #endif
+            return _data;
+        }
+        
+        public void PostEncode(GameObject gameObject = null)
+        {
+            if(this == null)
+                return;
+            
+            if(gameObject != null)
+                if(gameObject != this.gameObject)
+                    return;
+            
+            if(IsManual && gameObject == null)
+                return;
+            
+            for (int i = 0; i < _components.Count; i++)
+            {
+                string componentType = _components[i].GetType().FullName;
+                if (encodeDecoders.TryGetValue(componentType, out var encodeDecoder))
+                {
+                    encodeDecoder.PostEncode(_components[i], _data[i].DataDictionary);
+                }
+            }
+        }
+        
+        public void PreEncode(GameObject gameObject = null)
+        {
+            if(this == null)
+                return;
+            
+            if(gameObject != null)
+                if(gameObject != this.gameObject)
+                    return;
+            
+            if(IsManual && gameObject == null)
+                return;
+            
+            for (int i = 0; i < _components.Count; i++)
+            {
+                string componentType = _components[i].GetType().FullName;
+                if (encodeDecoders.TryGetValue(componentType, out var encodeDecoder))
+                {
+                    encodeDecoder.PreEncode(_components[i]);
+                }
+            }
+        }
+
+        public void Decode(DataList data)
+        {
+            _data = data;
+            for(int i = 0; i < _components.Count;i++)
+            {
+                string componentType = _components[i].GetType().FullName;
+                if (encodeDecoders.TryGetValue(componentType, out var encodeDecoder))
+                {
+                    if(data.Count > i && !data[i].IsNull)
+                        encodeDecoder.Decode(_components[i], data[i].DataDictionary);
+                }
+            }
+            
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+            ClientSimMain.GetInstance().GetEventDispatcher().SendEvent(new ClientSimOnPlayerObjectUpdatedEvent{Data = this});
+#endif
+        }
+        
+        public int GetNetworkComponentCount()
+        {
+            return _components.Count;
+        }
+        
+        public DataList GetData()
+        {
+            return _data;
+        }
+        
+        public List<MonoBehaviour> GetNetworkComponents()
+        {
+            return _components;
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs.meta b/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs.meta
new file mode 100644
index 0000000..7bbabd4
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkIdHolder.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 197c19bb6430471bb97ef9982849c00a
+timeCreated: 1709653519
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs b/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs
new file mode 100644
index 0000000..98c245e
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs
@@ -0,0 +1,438 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Components;
+using VRC.SDK3.Data;
+using VRC.SDKBase;
+using VRC.SDKBase.Network;
+using VRC.Utility;
+using Object = UnityEngine.Object;
+
+namespace VRC.SDK3.ClientSim
+{
+    public static class ClientSimNetworkingUtilities
+    {
+        public const int MinID = 10;
+        public const int MaxID = 100_000;
+        public const int MinimumViewID = 10;
+        
+        public const int PlayerDataObjectID = 4;
+        public static int FirstPlayerPersistenceID => System.Math.Max(MinimumViewID, 100);
+        public static int MaxPlayerPersistenceID => Mathf.CeilToInt(MaxID * 0.1f);
+        
+        private static VRCPlayerObject[] _playerObjectList;
+        
+        public enum OwnershipOption
+        {
+            /// <summary>
+            ///     Ownership is fixed. Instantiated objects stick with their creator, scene objects always belong to the Master Client.
+            /// </summary>
+            Fixed,
+            /// <summary>
+            ///     Ownership can be taken away from the current owner who can't object.
+            /// </summary>
+            Takeover,
+            /// <summary>
+            ///     Ownership can be requested with PhotonView.RequestOwnership but the current owner has to agree to give up ownership.
+            /// </summary>
+            /// <remarks>The current owner has to implement IPunCallbacks.OnOwnershipRequest to react to the ownership request.</remarks>
+            Request
+        }
+        
+        public static VRCPlayerObject[] GetPlayerObjectList()
+        {
+            if (_playerObjectList == null)
+            {
+                _playerObjectList = Object.FindObjectsOfType<VRCPlayerObject>(true);
+            }
+            return _playerObjectList;
+        }
+
+        #region NetworkIdGeneration
+
+        public static int FlattenPlayerViewId(int viewID)
+            => viewID % MaxID;
+        
+        public static void ConfigureNetworkOnScene(VRC_SceneDescriptor sceneDescriptor)
+        {
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+            VRCPlayerObject[] playerPersistence = GetPlayerObjectList();
+            bool IsPlayerPersistence(GameObject obj)
+                => playerPersistence != null && playerPersistence.Any(pp => obj.transform.IsChildOf(pp.transform) || obj.transform == pp.transform);
+#endif
+            
+            var (netIDs, _) = ConfigureNetworkIdsForClientSim(sceneDescriptor, out List<NetworkIDAssignment.SetErrorLocation> errors, NetworkIDAssignment.SetError.IncompatibleTypes);
+            if (errors.Count > 0)
+            {
+                foreach (var error in errors)
+                    Debug.LogError(error.ToString());
+                Debug.LogErrorFormat("Found {0} errors while configuring network IDs!", errors.Count);
+                #if UNITY_EDITOR
+                EditorApplication.isPlaying = false;
+                #endif
+                return;
+            }
+
+            foreach (NetworkIDPair netID in netIDs)
+            {
+                GameObject obj = netID.gameObject;
+                if (obj == null)
+                    continue;
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+                // This is initialized later, as players join
+                if (IsPlayerPersistence(netID.gameObject))
+                    continue;
+#endif
+                    
+                try
+                {
+                    IClientSimNetworkId view = obj.GetComponent<IClientSimNetworkId>();
+                    if(view == null)
+                        view = obj.AddComponent<ClientSimNetworkingView>() as IClientSimNetworkId;
+                    view.SetNetworkId(netID.ID);
+                    view.OwnershipStyle(OwnershipOption.Takeover);
+                }
+                catch (Exception e)
+                {
+                    #if UNITY_EDITOR
+                        EditorApplication.isPlaying = false;
+                    #endif
+                    Debug.LogErrorFormat("Failed to configure network IDs on {0}", obj.name);
+                    Debug.LogException(e);
+                }
+            }
+        }
+        
+#if UNITY_EDITOR
+        public static void DoSceneSetup()
+        {
+            //Find scene descriptor
+            VRC_SceneDescriptor descriptor = VRC_SceneDescriptor.Instance;
+            
+            if(descriptor == null)
+            {
+                VRC.Core.Logger.LogError("Unable to find scene descriptor in scene");
+                EditorApplication.isPlaying = false;
+                return;
+            }
+
+            var (_, newIDs) = NetworkIDAssignment.ConfigureNetworkIDs(
+                descriptor,
+                out List<NetworkIDAssignment.SetErrorLocation> errors,
+                NetworkIDAssignment.SetError.InvalidObject);
+            
+            if (errors.Count > 0)
+            {
+                // Try to fix the errors by removing duplicates
+                List<NetworkIDPair> newIDsList = errors.FindAll(error => error.error == NetworkIDAssignment.SetError.IncompatibleTypes)
+                    .Select(error => new NetworkIDPair{ gameObject = error.location.gameObject, ID = error.location.ID, SerializedTypeNames = NetworkIDAssignment.GetSerializedTypes(error.location.gameObject) })
+                    .ToList();
+
+                descriptor.NetworkIDCollection = descriptor.NetworkIDCollection
+                    .Where(pair =>
+                        newIDsList.FindIndex(newID => newID.ID == pair.ID && pair.gameObject == newID.gameObject) == -1)
+                    .ToList();
+            
+                descriptor.NetworkIDCollection.AddRange(newIDsList);
+                
+                (_, newIDs) = NetworkIDAssignment.ConfigureNetworkIDs(
+                    descriptor,
+                    out errors,
+                    NetworkIDAssignment.SetError.InvalidObject);
+                
+                if (errors.Count > 0)
+                {
+                    VRC.Core.Logger.LogError($"Failed to assign network IDs, {errors.Count} errors encountered!\nTry using the Network ID Utility to resolve them.");
+                    EditorApplication.isPlaying = false;
+                    return;
+                }
+            }
+
+            if (newIDs.Count() > 0)
+            {
+                descriptor.gameObject.MarkDirty();
+                PrefabUtility.RecordPrefabInstancePropertyModifications(descriptor);
+                UnityEditor.AssetDatabase.SaveAssets();
+            }
+        }
+#endif
+        
+        private static (IEnumerable<NetworkIDPair> allIDs, IEnumerable<NetworkIDPair> newIDs) ConfigureNetworkIdsForClientSim(INetworkIDContainer container, out List<NetworkIDAssignment.SetErrorLocation> errors, params NetworkIDAssignment.SetError[] errorsToIgnore)
+        {
+            errors = new List<NetworkIDAssignment.SetErrorLocation>();
+            if(container.NetworkIDCollection == null)
+                container.NetworkIDCollection = new List<NetworkIDPair>();
+            
+            List<INetworkID> netIDs = new List<INetworkID>();
+            List<NetworkIDPair> newIDs = new List<NetworkIDPair>();
+            Dictionary<GameObject, NetworkIDPair> idMap = new Dictionary<GameObject, NetworkIDPair>();
+            int id = MinID;
+            Scene scene = SceneManager.GetActiveScene();
+            
+            foreach (var pair in container.NetworkIDCollection)
+            {
+                if (!pair.gameObject)
+                {
+                    errors.Add(new NetworkIDAssignment.SetErrorLocation { error = NetworkIDAssignment.SetError.InvalidObject, location = pair });
+                }
+                else if (pair.ID < MinID || pair.ID >= MaxID)
+                {
+                    errors.Add(new NetworkIDAssignment.SetErrorLocation { error = NetworkIDAssignment.SetError.InvalidId, location = pair });
+                }
+                else
+                {
+                    idMap[pair.gameObject] = pair;
+                    
+                    if (pair.ID >= id)
+                        id = pair.ID + 1;
+                }
+            }
+            
+            GameObject[] allObjects = GameObject.FindObjectsOfType<GameObject>(true);
+            
+            foreach (var obj in allObjects)
+            {
+                netIDs.AddRange(obj.GetComponents<INetworkID>());
+            }
+            
+            netIDs = netIDs
+                .Where(nid => (nid is Component cnid) && cnid.gameObject && scene == cnid.gameObject.scene)
+                .Select(nid => (nid as Component).gameObject)
+                .Distinct()
+                .OrderBy(go => go.transform.Path(), StringComparer.InvariantCulture)
+                .Select(go => go.GetComponent<INetworkID>())
+                .ToList();
+
+            id = FindNextFreeID(id);
+            foreach (INetworkID netID in netIDs)
+                if (TrySetID(netID, ref id, ref errors, out NetworkIDPair newIDPair) && newIDPair != null)
+                    newIDs.Add(newIDPair);
+
+            errors.RemoveAll(err => errorsToIgnore.Contains(err.error));
+            
+            container.NetworkIDCollection = idMap.Values.ToList();
+
+            return (netIDs.Select(nid => idMap[(nid as Component).gameObject]).Distinct(), newIDs);
+            
+            bool TrySetID(INetworkID NetworkID, ref int refId, ref List<NetworkIDAssignment.SetErrorLocation> errors, out NetworkIDPair newIDPair)
+            {
+                GameObject source = (NetworkID as Component).gameObject;
+                List<string> typeNames = GetSerializedTypes(NetworkID);
+                int curId = refId;
+                newIDPair = null;
+            
+                if (curId < MinID || curId >= MaxID)
+                {
+                    errors.Add(new NetworkIDAssignment.SetErrorLocation { error = NetworkIDAssignment.SetError.InvalidId, location = new NetworkIDPair { gameObject = source, ID = curId } });
+                    return false;
+                }
+
+                if (idMap.Values.Any(pair => pair.ID == curId && pair.gameObject != source))
+                {
+                    errors.Add(new NetworkIDAssignment.SetErrorLocation 
+                    { 
+                        error = NetworkIDAssignment.SetError.IdInUse, 
+                        location = new NetworkIDPair { gameObject = source, ID = curId },
+                        relatedLocation = idMap.Values.First(pair => pair.ID == curId && pair.gameObject != source)
+                    });
+                    
+                    return false;
+                }
+
+                if (idMap.TryGetValue(source, out NetworkIDPair matchInfo))
+                {
+                    if (!DoTypesMatch(matchInfo, typeNames))
+                        errors.Add(new NetworkIDAssignment.SetErrorLocation { error = NetworkIDAssignment.SetError.IncompatibleTypes, location = matchInfo });
+                }
+                else
+                {
+                    newIDPair = new SDKBase.Network.NetworkIDPair
+                    {
+                        gameObject = source,
+                        ID = curId,
+                        SerializedTypeNames = typeNames
+                    };
+                    
+                    idMap.Add(source, newIDPair);
+                    
+                    refId = FindNextFreeID(curId);
+                }
+                
+                return true;
+            }
+            
+            bool DoTypesMatch(NetworkIDPair idInfo, List<string> typeNames)
+                => idInfo.SerializedTypeNames.Count == 0 // Won't exist for old scenes
+                   || idInfo.SerializedTypeNames.SequenceEqual(typeNames);
+            
+            int FindNextFreeID(int curId)
+            {
+                void findNextFree()
+                {
+                    while (idMap.Values.Any(pair => pair.ID == curId) && curId < MaxID)
+                        curId++;
+                }
+
+                findNextFree();
+
+                // Loop over once, in case there are gaps
+                if (curId >= MaxID)
+                {
+                    curId = MinID;
+                    findNextFree();
+                }
+
+                if (curId >= MaxID)
+                    throw new System.ApplicationException("Ran out of Network IDs!");
+
+                return curId;
+            }
+        }
+        
+        public static List<string> GetSerializedTypes(INetworkID NetworkID)
+            => GetSerializedTypes((NetworkID as Component).gameObject);
+        
+        public static List<string> GetSerializedTypes(GameObject NetworkID)
+            => NetworkID
+                .GetComponents<VRCNetworkBehaviour>()
+                .Select(nb => nb.GetType().FullName)
+                .ToList();
+        
+        #endregion
+
+        #region Conversion To/From JToken
+
+        public static DataToken GetJTokenFromVector3(this Vector3 vector3)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "V3";
+            jObject["x"] = vector3.x;
+            jObject["y"] = vector3.y;
+            jObject["z"] = vector3.z;
+            return jObject;
+        }
+        
+        public static DataToken GetJTokenFromQuaternion(this Quaternion quaternion)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "Q";
+            jObject["x"] = quaternion.x;
+            jObject["y"] = quaternion.y;
+            jObject["z"] = quaternion.z;
+            jObject["w"] = quaternion.w;
+            return jObject;
+        }
+        
+        public static DataToken GetJTokenFromVector2(this Vector2 vector2)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "V2";
+            jObject["x"] = vector2.x;
+            jObject["y"] = vector2.y;
+            return jObject;
+        }
+        
+        public static DataToken GetJTokenFromColor(this Color color)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "C";
+            jObject["r"] = color.r;
+            jObject["g"] = color.g;
+            jObject["b"] = color.b;
+            jObject["a"] = color.a;
+            return jObject;
+        }
+        
+        public static DataToken GetJTokenFromColor32(this Color32 color32)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "C32";
+            jObject["r"] = color32.r;
+            jObject["g"] = color32.g;
+            jObject["b"] = color32.b;
+            jObject["a"] = color32.a;
+            return jObject;
+        }
+        
+        public static DataToken GetJTokenFromVector4(this Vector4 vector4)
+        {
+            DataDictionary jObject = new DataDictionary();
+            jObject["T"] = "V4";
+            jObject["x"] = vector4.x;
+            jObject["y"] = vector4.y;
+            jObject["z"] = vector4.z;
+            jObject["w"] = vector4.w;
+            return jObject;
+        }
+        
+        public static Vector3 GetVector3(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Vector3((float)dict["x"].Double, (float)dict["y"].Double, (float)dict["z"].Double);
+            }
+            return Vector3.zero;
+        }
+        
+        public static Quaternion GetQuaternion(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Quaternion((float)dict["x"].Double, (float)dict["y"].Double, (float)dict["z"].Double, (float)dict["w"].Double);
+            }
+            return Quaternion.identity;
+        }
+        
+        public static Vector2 GetVector2(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Vector2((float)dict["x"].Double, (float)dict["y"].Double);
+            }
+            return Vector2.zero;
+        }
+        
+        public static Color GetColor(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Color((float)dict["r"].Double, (float)dict["g"].Double, (float)dict["b"].Double, (float)dict["a"].Double);
+            }
+            return Color.black;
+        }
+        
+        public static Color32 GetColor32(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Color32((byte)dict["r"].Double, (byte)dict["g"].Double, (byte)dict["b"].Double, (byte)dict["a"].Double);
+            }
+            return new Color32(0, 0, 0, 0);
+        }
+        
+        public static Vector4 GetVector4(this DataToken jToken)
+        {
+            DataDictionary dict = jToken.DataDictionary;
+            if (dict != null)
+            {
+                return new Vector4((float)dict["x"].Double, (float)dict["y"].Double, (float)dict["z"].Double, (float)dict["w"].Double);
+            }
+            return Vector4.zero;
+        }
+        
+        
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs.meta b/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs.meta
new file mode 100644
index 0000000..48e13d8
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkingUtilities.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 91efea47f0e9471bb1167162bed3ea1d
+timeCreated: 1709653994
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkingView.cs b/Source/Runtime/Networking/ClientSimNetworkingView.cs
new file mode 100644
index 0000000..2f50dfa
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkingView.cs
@@ -0,0 +1,99 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim
+{
+    public class ClientSimNetworkingView : ClientSimBehaviour, IClientSimNetworkId, IClientSimNetworkView
+    {
+        private int _networkId;
+        private int _playerId;
+        private ClientSimNetworkingUtilities.OwnershipOption _ownershipOption;
+        private List<IClientSimNetworkSerializer> _networkedObjects = new List<IClientSimNetworkSerializer>();
+        private bool _persist = true;
+        private DataList _data;
+        
+        public void SetNetworkId(int networkId)
+        {
+            _networkId = networkId;
+        }
+        
+        public void SetPersist(bool persist)
+        {
+            _persist = persist;
+        }
+        
+        public bool GetPersist()
+        {
+            return _persist;
+        }
+
+        public int GetNetworkId()
+        {
+            return _networkId;
+        }
+        
+        public void SetPlayerId(int playerId)
+        {
+            _playerId = playerId;
+        }
+        
+        public int GetPlayerId()
+        {
+            return _playerId;
+        }
+
+        public void OwnershipStyle(ClientSimNetworkingUtilities.OwnershipOption option)
+        {
+            _ownershipOption = option;
+        }
+
+        public void AddNetworkedObject(IClientSimNetworkSerializer obj)
+        {
+            if(!_networkedObjects.Contains(obj))
+                _networkedObjects.Add(obj);
+        }
+
+        public DataList Encode(GameObject gameObject = null)
+        {
+            _data ??= new DataList();
+            
+            if(!_persist) return _data;
+            
+            for (int i = 0; i < _networkedObjects.Count; i++)
+            {
+                IClientSimNetworkSerializer obj = _networkedObjects[i];
+                obj.PreEncode(gameObject);
+                if(obj.IsDirty(gameObject))
+                {
+                    DataList objData = obj.Encode(gameObject);
+                    if(objData != null)
+                        if(_data.Count > i)
+                            _data[i] = objData;
+                        else
+                            _data.Add(objData);
+                }
+                obj.PostEncode(gameObject);
+            }
+            
+            return _data;
+        }
+
+        public void Decode(DataList data)
+        {
+            _data = data;
+            // If the data is not the same size as the networked objects, we can't decode it. This is possible if PlayerObjects are added or removed.
+            if(data.Count != _networkedObjects.Count)
+            {
+                return;
+            }
+            
+            for (int i =0; i < _networkedObjects.Count;i++)
+            {
+                _networkedObjects[i].Decode(data[i].DataList);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/ClientSimNetworkingView.cs.meta b/Source/Runtime/Networking/ClientSimNetworkingView.cs.meta
new file mode 100644
index 0000000..0d9cfab
--- /dev/null
+++ b/Source/Runtime/Networking/ClientSimNetworkingView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6296660aa7ac42f8ab5a8a7c4439c53d
+timeCreated: 1710776534
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders.meta b/Source/Runtime/Networking/EncodeDecoders.meta
new file mode 100644
index 0000000..097fdac
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f2dd6ec7ad394795bcbb866efc8840a7
+timeCreated: 1710765786
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs
new file mode 100644
index 0000000..29de9b5
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs
@@ -0,0 +1,90 @@
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Components;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.EncodeDecoders
+{
+    public class ClientSimObjectPoolEncodeDecode : IClientSimEncodeDecoder
+    {
+        public DataDictionary Encode(MonoBehaviour component)
+        {
+            VRCObjectPool objectPool = (VRCObjectPool) component;
+            
+            DataDictionary data = new DataDictionary();
+            
+            data["Length"] = objectPool.Pool.Length;
+            DataList values = new DataList();
+
+            for (int i = 0; i < objectPool.Pool.Length; i++)
+            {   
+                values.Add( objectPool.Pool[i].activeSelf);
+            }
+            
+            data["Values"] = values;
+            
+            return data;
+        }
+         
+        public void PreEncode(MonoBehaviour component)
+        {
+        }
+        
+        public void PostEncode(MonoBehaviour component, DataDictionary data)
+        {
+        }
+       
+
+        public void Decode(MonoBehaviour component, DataDictionary data)
+        {
+            VRCObjectPool objectPool = (VRCObjectPool) component;
+            
+            if (data.TryGetValue("Length", out DataToken lengthToken))
+            {
+                int length = (int)lengthToken.Double;
+                
+                if (data.TryGetValue("Values", out DataToken valuesToken))
+                {
+                    DataList values = valuesToken.DataList;
+                    for (int i = 0; i < length; i++)
+                    {
+                        objectPool.Pool[i].SetActive(values[i].Boolean);
+                    }
+                }
+            }
+        }
+        
+        public bool IsManualSynced(MonoBehaviour component)
+        {
+            return false;
+        }
+
+        public bool IsDirty(MonoBehaviour component, DataDictionary data)
+        {
+            VRCObjectPool objectPool = (VRCObjectPool) component;
+            
+            if (data.TryGetValue("Length", out DataToken lengthToken))
+            {
+                int length = (int)lengthToken.Double;
+                
+                if (data.TryGetValue("Values", out DataToken valuesToken))
+                {
+                    DataList values = valuesToken.DataList;
+                    for (int i = 0; i < length; i++)
+                    {
+                        if (objectPool.Pool[i].activeSelf != values[i].Boolean)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs.meta b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs.meta
new file mode 100644
index 0000000..53f2b05
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectPoolEncodeDecode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4e271e685c8c4adfa9c6eacf4a0ae1ac
+timeCreated: 1710948667
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs
new file mode 100644
index 0000000..a4aef2f
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs
@@ -0,0 +1,170 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Components;
+using VRC.SDK3.Data;
+
+#if UNITY_EDITOR
+using BestHTTP.JSON;
+using UnityEditor;
+#endif
+
+namespace VRC.SDK3.ClientSim.EncodeDecoders
+{
+    public class ClientSimObjectSyncEncodeDecoder : IClientSimEncodeDecoder
+    {
+        public DataDictionary Encode(MonoBehaviour component)
+        {
+            VRCObjectSync objectSync = (VRCObjectSync) component;
+            Transform transform = objectSync.transform;
+            Rigidbody rigidbody = objectSync.GetComponent<Rigidbody>();
+            bool hasRigidbody = rigidbody != null;
+            DataDictionary data = new DataDictionary();
+            
+            data["Position"] = transform.position.GetJTokenFromVector3();
+            data["Rotation"] = transform.rotation.GetJTokenFromQuaternion();
+            data["Velocity"] = hasRigidbody ? rigidbody.velocity.GetJTokenFromVector3() : "not available";
+            data["IsKinematic"] = !hasRigidbody || rigidbody.isKinematic;
+            data["UseGravity"] = hasRigidbody && rigidbody.useGravity;
+            data["Discontinuity"] = "not available";
+            data["DiscontinuityCounter"] = "not available";
+            data["WasSleeping"] = hasRigidbody && rigidbody.IsSleeping();
+            data["Time"] = Time.realtimeSinceStartup;
+            data["HeldInHand"] = "not available";
+            return data;
+        }
+        public void PreEncode(MonoBehaviour component)
+        {
+        }
+        
+        public void PostEncode(MonoBehaviour component, DataDictionary data)
+        {
+        }
+        
+        
+        
+        public bool IsManualSynced(MonoBehaviour component)
+        {
+            return false;
+        }
+        
+        public bool IsDirty(MonoBehaviour component, DataDictionary data)
+        {
+            VRCObjectSync objectSync = (VRCObjectSync) component;
+            if(objectSync == null)
+            {
+                return false;
+            }
+            Transform transform = objectSync.transform;
+            Rigidbody rigidbody = objectSync.GetComponent<Rigidbody>();
+            
+            if(data.TryGetValue("Position", out DataToken positionToken))
+            {
+                if (transform.position != positionToken.GetVector3())
+                {
+                    return true;
+                }
+            }
+            
+            if(data.TryGetValue("Rotation", out DataToken rotationToken))
+            {
+                if (transform.rotation != rotationToken.GetQuaternion())
+                {
+                    return true;
+                }
+            }
+            
+            if(data.TryGetValue("Velocity", out DataToken velocityToken))
+            {
+                if (rigidbody != null && rigidbody.velocity != velocityToken.GetVector3())
+                {
+                    return true;
+                }
+            }
+            
+            if(data.TryGetValue("IsKinematic", out DataToken isKinematicToken))
+            {
+                if (rigidbody != null && rigidbody.isKinematic != isKinematicToken.Boolean)
+                {
+                    return true;
+                }
+            }
+            
+            if(data.TryGetValue("UseGravity", out DataToken useGravityToken))
+            {
+                if (rigidbody != null && rigidbody.useGravity != useGravityToken.Boolean)
+                {
+                    return true;
+                }
+            }
+            
+            if(data.TryGetValue("WasSleeping", out DataToken wasSleepingToken))
+            {
+                if (rigidbody != null && rigidbody.IsSleeping() != wasSleepingToken.Boolean)
+                {
+                    return true;
+                }
+            }
+            
+            return false;
+        }
+
+        public void Decode(MonoBehaviour component, DataDictionary data)
+        {
+            VRCObjectSync objectSync = (VRCObjectSync) component;
+            Transform transform = objectSync.transform;
+            Rigidbody rigidbody = objectSync.GetComponent<Rigidbody>();
+            
+            if (data.TryGetValue("Position", out DataToken positionToken))
+            {
+                transform.position = positionToken.GetVector3();
+            }
+            
+            if (data.TryGetValue("Rotation", out DataToken rotationToken))
+            {
+                transform.rotation = rotationToken.GetQuaternion();
+            }
+            
+            if (data.TryGetValue("Velocity", out DataToken velocityToken))
+            {
+                if (rigidbody != null)
+                {
+                    rigidbody.velocity = velocityToken.GetVector3();
+                }
+            }
+            
+            if (data.TryGetValue("IsKinematic", out DataToken isKinematicToken))
+            {
+                if (rigidbody != null)
+                {
+                    rigidbody.isKinematic = isKinematicToken.Boolean;
+                }
+            }
+            
+            if (data.TryGetValue("UseGravity", out DataToken useGravityToken))
+            {
+                if (rigidbody != null)
+                {
+                    rigidbody.useGravity = useGravityToken.Boolean;
+                }
+            }
+            
+            if (data.TryGetValue("WasSleeping", out DataToken wasSleepingToken))
+            {
+                if (rigidbody != null)
+                {
+                    if (wasSleepingToken.Boolean)
+                    {
+                        rigidbody.Sleep();
+                    }
+                    else
+                    {
+                        rigidbody.WakeUp();
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs.meta b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs.meta
new file mode 100644
index 0000000..06bc0ee
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimObjectSyncEncodeDecoder.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 616494e20f224f1095644c36acd3141e
+timeCreated: 1710765810
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs b/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs
new file mode 100644
index 0000000..e095bf8
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs
@@ -0,0 +1,223 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Data;
+using VRC.SDKBase;
+using VRC.Udon;
+using VRC.Udon.Common;
+using VRC.Udon.Common.Interfaces;
+
+namespace VRC.SDK3.ClientSim.EncodeDecoders
+{
+    public class ClientSimUdonEncodeDecode : IClientSimEncodeDecoder
+    {
+        public void PreEncode(MonoBehaviour component)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            udonBehaviour.OnPreSerialization();
+        }
+        
+        public DataDictionary Encode(MonoBehaviour component)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            DataDictionary data = new DataDictionary();
+
+            IEnumerable<IUdonSyncMetadata> SyncMetadatas = udonBehaviour.SyncMetadataTable.GetAllSyncMetadata();
+
+            foreach (IUdonSyncMetadata syncMetadata in SyncMetadatas)
+            {
+                object obj = udonBehaviour.GetProgramVariable(syncMetadata.Name);
+                data.Add(syncMetadata.Name, GetJTokenFromObject(obj));
+            }
+            
+            return data;
+        }
+        
+        public void PostEncode(MonoBehaviour component, DataDictionary data)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            udonBehaviour.OnPostSerialization(new SerializationResult(true,data.Count*4));
+        }
+        
+        public bool IsManualSynced(MonoBehaviour component)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            return udonBehaviour.SyncMethod == Networking.SyncType.Manual;
+        }
+
+        public bool IsDirty(MonoBehaviour component, DataDictionary data)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            
+            IUdonSyncMetadataTable syncMetadataTable = udonBehaviour.SyncMetadataTable;
+            if(syncMetadataTable == null)
+                return false;
+            
+            IEnumerable<IUdonSyncMetadata> SyncMetadatas = syncMetadataTable.GetAllSyncMetadata();
+
+            foreach (IUdonSyncMetadata syncMetadata in SyncMetadatas)
+            {
+                if (data.ContainsKey(syncMetadata.Name))
+                {
+                    if (!IsDataSame(data[syncMetadata.Name],GetJTokenFromObject(udonBehaviour.GetProgramVariable(syncMetadata.Name))))
+                        return true;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static DataToken GetJTokenFromObject(object obj)
+        {
+            if(obj == null)
+                return new DataToken();
+            
+            if (obj.GetType().IsArray)
+            {
+                DataList jArray = new DataList();
+                foreach (object arrayObj in (Array)obj)
+                {
+                    jArray.Add(GetJTokenFromObject(arrayObj));
+                }
+                return jArray;
+            }
+            
+            return obj switch
+            {
+                bool bo => new DataToken(bo),
+                char c => new DataToken(c),
+                byte b => new DataToken(b),
+                sbyte sb => new DataToken(sb),
+                short s => new DataToken(s),
+                ushort us => new DataToken(us),
+                int i => new DataToken(i),
+                uint u => new DataToken(u),
+                long l => new DataToken(l),
+                ulong ul => new DataToken(ul),
+                float f => new DataToken(f),
+                double d => new DataToken(d),
+                Vector2 vector2 => vector2.GetJTokenFromVector2(),
+                Vector3 vector3 => vector3.GetJTokenFromVector3(),
+                Vector4 vector4 => vector4.GetJTokenFromVector4(),
+                Quaternion quaternion => quaternion.GetJTokenFromQuaternion(),
+                string str => new DataToken(str),
+                VRCUrl url => new DataToken(url.Get()),
+                Color color => color.GetJTokenFromColor(),
+                Color32 color32 => color32.GetJTokenFromColor32(),
+                _ => new DataToken()
+            };
+        }
+        
+        public object Get(Type t, DataToken dataToken)
+        {
+            if (t.IsArray)
+            {
+                Array array = Array.CreateInstance(t.GetElementType(), dataToken.DataList.Count);
+                for (int i = 0; i < dataToken.DataList.Count; i++)
+                {
+                    array.SetValue(Get(t.GetElementType(), dataToken.DataList[i]), i);
+                }
+                return array;
+            }
+            
+            return t switch
+            {
+                Type boolType when boolType == typeof(bool) => dataToken.Boolean,
+                Type charType when charType == typeof(char) => dataToken.String[0],
+                Type byteType when byteType == typeof(byte) => (byte)dataToken.Double,
+                Type sbyteType when sbyteType == typeof(sbyte) => (sbyte)dataToken.Double,
+                Type shortType when shortType == typeof(short) => (short)dataToken.Double,
+                Type ushortType when ushortType == typeof(ushort) => (ushort)dataToken.Double,
+                Type intType when intType == typeof(int) => (int)dataToken.Double,
+                Type uintType when uintType == typeof(uint) => (uint)dataToken.Double,
+                Type longType when longType == typeof(long) => (long)dataToken.Double,
+                Type ulongType when ulongType == typeof(ulong) => (ulong)dataToken.Double,
+                Type floatType when floatType == typeof(float) => (float)dataToken.Double,
+                Type doubleType when doubleType == typeof(double) => dataToken.Double,
+                Type vector2Type when vector2Type == typeof(Vector2) => dataToken.GetVector2(),
+                Type vector3Type when vector3Type == typeof(Vector3) => dataToken.GetVector3(),
+                Type vector4Type when vector4Type == typeof(Vector4) => dataToken.GetVector4(),
+                Type quaternionType when quaternionType == typeof(Quaternion) => dataToken.GetQuaternion(),
+                Type stringType when stringType == typeof(string) => dataToken.String,
+                Type urlType when urlType == typeof(VRCUrl) => new VRCUrl(dataToken.String),
+                Type colorType when colorType == typeof(Color) => dataToken.GetColor(),
+                Type color32Type when color32Type == typeof(Color32) => dataToken.GetColor32(),
+                _ => null
+            };
+            
+        }
+
+        public void Decode(MonoBehaviour component, DataDictionary data)
+        {
+            UdonBehaviour udonBehaviour = component as UdonBehaviour;
+            
+            IEnumerable<IUdonSyncMetadata> SyncMetadatas = udonBehaviour.SyncMetadataTable.GetAllSyncMetadata();
+
+            foreach (IUdonSyncMetadata syncMetadata in SyncMetadatas)
+            {
+                if (data.ContainsKey(syncMetadata.Name))
+                {
+                    Type type = udonBehaviour.GetProgramVariableType(syncMetadata.Name);
+                    udonBehaviour.SetProgramVariable(syncMetadata.Name,
+                        Get(type,data[syncMetadata.Name]));
+                }
+            }
+
+            udonBehaviour.OnDeserialization(new DeserializationResult(0, 0, true));
+            
+        }
+
+        private bool IsDataSame(DataToken a, DataToken b)
+        {
+            if(a.TokenType != b.TokenType)
+                return false;
+
+            switch (a.TokenType)
+            {
+                case TokenType.DataList when a.DataList.Count != b.DataList.Count:
+                    return false;
+                case TokenType.DataList:
+                {
+                    for (int i = 0; i < a.DataList.Count; i++)
+                    {
+                        if (!IsDataSame(a.DataList[i], b.DataList[i]))
+                            return false;
+                    }
+
+                    break;
+                }
+                case TokenType.DataDictionary when a.DataDictionary.Count != b.DataDictionary.Count:
+                    return false;
+                case TokenType.DataDictionary:
+                {
+                    foreach (KeyValuePair<DataToken, DataToken> keyValuePair in a.DataDictionary)
+                    {
+                        if (!b.DataDictionary.ContainsKey(keyValuePair.Key))
+                            return false;
+
+                        if (!IsDataSame(keyValuePair.Value, b.DataDictionary[keyValuePair.Key]))
+                            return false;
+                    }
+
+                    break;
+                }
+                default:
+                    return a.Equals(b);
+            }
+            
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs.meta b/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs.meta
new file mode 100644
index 0000000..07551af
--- /dev/null
+++ b/Source/Runtime/Networking/EncodeDecoders/ClientSimUdonEncodeDecode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 78783327b868484796bf6a9a824fc123
+timeCreated: 1710874470
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces.meta b/Source/Runtime/Networking/Interfaces.meta
new file mode 100644
index 0000000..a42f287
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4325933c93df4022b3e4699f171f76f9
+timeCreated: 1709653577
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs b/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs
new file mode 100644
index 0000000..28730a1
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs
@@ -0,0 +1,24 @@
+
+using BestHTTP.JSON;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Interfaces
+{
+    public interface IClientSimEncodeDecoder
+    {
+         DataDictionary Encode(MonoBehaviour component);
+         
+         void Decode(MonoBehaviour component, DataDictionary data);
+         
+         public bool IsManualSynced(MonoBehaviour component);
+         
+         bool IsDirty(MonoBehaviour component, DataDictionary data);
+         
+         void PostEncode(MonoBehaviour component, DataDictionary data);
+         
+         void PreEncode(MonoBehaviour component);
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs.meta b/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs.meta
new file mode 100644
index 0000000..a2166fc
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimEncodeDecoder.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b2d1b3d741084cd081baf2ef556378fe
+timeCreated: 1710765826
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs b/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs
new file mode 100644
index 0000000..9a64e56
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace VRC.SDK3.ClientSim.Interfaces
+{
+    public interface IClientSimNetworkId
+    {
+        public void SetNetworkId(int networkId);
+        public int GetNetworkId();
+        
+        public void OwnershipStyle(ClientSimNetworkingUtilities.OwnershipOption option);
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs.meta b/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs.meta
new file mode 100644
index 0000000..7b0beaa
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkId.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 653d0e2b7d2e4b11a6fe5160b5c52c08
+timeCreated: 1709290307
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs b/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs
new file mode 100644
index 0000000..b3eeda4
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Interfaces
+{
+    public interface IClientSimNetworkSerializer
+    {
+        DataList Encode(GameObject gameObject = null);
+        void Decode(DataList data);
+        DataList GetData();
+        bool IsDirty(GameObject gameObject = null);
+        int GetPlayerId();
+        void SetNetworkComponents();
+        int GetNetworkComponentCount();
+        List<MonoBehaviour> GetNetworkComponents();
+        void PostEncode(GameObject gameObject = null);
+        void PreEncode(GameObject gameObject = null);
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs.meta b/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs.meta
new file mode 100644
index 0000000..6752cb9
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkSerializer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4533b7b933a340b9b7d4ff9a99bfb0f5
+timeCreated: 1710436946
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs b/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs
new file mode 100644
index 0000000..9c7f58f
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using VRC.SDK3.Data;
+
+namespace VRC.SDK3.ClientSim.Interfaces
+{
+    public interface IClientSimNetworkView
+    {
+        DataList Encode(GameObject gameObject = null);
+
+        void Decode(DataList data);
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs.meta b/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs.meta
new file mode 100644
index 0000000..9f8bcea
--- /dev/null
+++ b/Source/Runtime/Networking/Interfaces/IClientSimNetworkView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 261ee1d33413443daecbfb1b7aac8583
+timeCreated: 1710777013
\ No newline at end of file
diff --git a/Source/Runtime/Player/ClientSimPlayer.cs b/Source/Runtime/Player/ClientSimPlayer.cs
index dc75e6c..19e099b 100644
--- a/Source/Runtime/Player/ClientSimPlayer.cs
+++ b/Source/Runtime/Player/ClientSimPlayer.cs
@@ -1,5 +1,18 @@
-using UnityEngine;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using VRC.SDK3.Components;
 using VRC.SDKBase;
+using VRC.Udon;
+using VRC.Utility;
+using Object = UnityEngine.Object;
+using VRCStation = VRC.SDK3.Components.VRCStation;
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using VRC.SDK3.ClientSim.Persistence;
+using VRC.SDKBase.Network;
+#endif
 
 namespace VRC.SDK3.ClientSim
 {
@@ -31,20 +44,32 @@ public class ClientSimPlayer : ClientSimBehaviour, IClientSimPlayerApiProvider
         private ClientSimCombatSystemHelper _combatSystemHelper;
 
         private IClientSimEventDispatcher _eventDispatcher;
+        private IClientSimPlayerManager _playerManager;
         private ClientSimInteractManager _interactManager;
         private IClientSimSceneManager _sceneManager;
         private IClientSimProxyObjectProvider _proxyProvider;
+        private IClientSimUdonEventSender _udonEventSender;
         private ClientSimSettings _settings;
         
         public VRCPlayerApi Player { get; private set; }
         public bool IsUserVR { get; private set; }
         public bool isInstanceOwner;
+        public bool isSuspended;
 
         // Public to allow users to edit values in editor.
-        public ClientSimPlayerLocomotionData locomotionData = new ClientSimPlayerLocomotionData();
-        public ClientSimPlayerPickupData pickupData = new ClientSimPlayerPickupData();
-        public ClientSimPlayerAudioData audioData = new ClientSimPlayerAudioData();
-        public ClientSimPlayerTagsData tagData = new ClientSimPlayerTagsData();
+        public ClientSimPlayerLocomotionData locomotionData = new();
+        public ClientSimPlayerPickupData pickupData = new();
+        public ClientSimPlayerAudioData audioData = new();
+        public ClientSimPlayerTagsData tagData = new();
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+        public GameObject[] PlayerPersistenceObjects = Array.Empty<GameObject>();
+        public GameObject[] PlayerPersistenceRootObjects = Array.Empty<GameObject>();
+        public ClientSimPlayerDataStorage PlayerDataPrefab;
+        internal ClientSimPlayerDataStorage PlayerDataObject;
+        internal ClientSimPlayerObjectStorage PlayerObjectData;
+        private ClientSimPlayerRestoredStatus playerRestoredStatus = new();
+#endif
         
         public void SetPlayer(VRCPlayerApi player)
         {
@@ -61,13 +86,20 @@ public void Initialize(
             IClientSimMousePositionProvider mousePositionProvider,
             IClientSimSceneManager sceneManager,
             IClientSimProxyObjectProvider proxyProvider,
+            IClientSimUdonEventSender udonEventSender,
+            IClientSimBlacklistManager blacklistManager,
+            IClientSimUdonManager udonManager,
+            IClientSimSyncedObjectManager syncedObjectManager,
+            IClientSimPlayerManager playerManager,
             IClientSimPlayerHeightManager heightManager)
         {
             _eventDispatcher = eventDispatcher;
             _settings = settings;
             _sceneManager = sceneManager;
             _proxyProvider = proxyProvider;
-
+            _playerManager = playerManager;
+            _udonEventSender = udonEventSender;
+            
             // TODO take settings and spawn desktop vs vr tracking data
             playerTrackingData.Initialize(eventDispatcher, input, settings, heightManager);
             IsUserVR = playerTrackingData.IsVR();
@@ -112,6 +144,11 @@ public void Initialize(
             }
         }
 
+        public void SetEventDispatcher(IClientSimEventDispatcher eventDispatcher)
+        {
+            _eventDispatcher = eventDispatcher;
+        }
+        
         public void InitializeCombat()
         {
             if (_combatSystemHelper != null)
@@ -123,6 +160,252 @@ public void InitializeCombat()
             _combatSystemHelper.Initialize(Player, _eventDispatcher, _proxyProvider, playerController);
         }
 
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+
+        internal void SetupPlayerPersistence(IClientSimEventDispatcher eventDispatcher, IClientSimUdonEventSender udonEventSender, IClientSimBlacklistManager blacklistManager, IClientSimUdonManager udonManager, IClientSimSyncedObjectManager syncedObjectManager,IClientSimPlayerManager playerManager)
+        {
+            _eventDispatcher = eventDispatcher;
+            _udonEventSender = udonEventSender;
+            
+            eventDispatcher.Subscribe<ClientSimOnPlayerDataDecodedEvent>(OnPlayerDataDecoded);
+            eventDispatcher.Subscribe<ClientSimOnPlayerObjectsDecodedEvent>(OnPlayerObjectsDecoded);
+            
+            GameObject dataObject = Instantiate(PlayerDataPrefab.gameObject);
+            int playerId = playerManager.GetPlayerID(Player);
+            
+            PlayerDataObject = dataObject.GetComponent<ClientSimPlayerDataStorage>();
+            PlayerDataObject.Init(Player, udonEventSender, eventDispatcher);
+            PlayerDataObject.gameObject.hideFlags = HideFlags.HideInHierarchy | HideFlags.HideInInspector;
+            
+            PlayerObjectData = dataObject.GetComponent<ClientSimPlayerObjectStorage>();
+            PlayerObjectData.Init(Player, udonEventSender, eventDispatcher);
+            
+            blacklistManager.AddObjectAndChildrenToBlackList(PlayerDataObject.gameObject);
+            
+            // spawning PlayerObjects
+            VRCPlayerObject[] playerObjects = ClientSimNetworkingUtilities.GetPlayerObjectList();
+            
+            VRCSceneDescriptor sdk3Descriptor = (VRCSceneDescriptor)VRC_SceneDescriptor.Instance;
+            
+            List<GameObject> playerObjectInstances = new List<GameObject>();
+            
+            int baseId = (playerId * ClientSimNetworkingUtilities.MaxID) + 
+                         ClientSimNetworkingUtilities.FirstPlayerPersistenceID;
+            
+            for (int i = 0; i < playerObjects.Length; i++)
+            {
+                VRCPlayerObject playerObject = playerObjects[i];
+                GameObject playerObjectGameObject = playerObject.gameObject;
+                Transform playerObjectTransform = playerObjectGameObject.transform;
+                playerObjectGameObject.SetActive(false);
+            
+                GameObject instance = Object.Instantiate(playerObjectGameObject, playerObjectTransform.parent, true);
+                instance.transform.localScale = playerObjectTransform.localScale;
+                instance.transform.localPosition = playerObjectTransform.localPosition;
+                instance.transform.localRotation = playerObjectTransform.localRotation;
+                
+                playerObjectInstances.Add(instance);
+                
+                instance.transform.name = playerObjectTransform.name + " [" + playerId + "]"; 
+                
+                INetworkID[] networkIds = instance.GetComponentsInChildren<INetworkID>(true);
+
+                foreach (INetworkID networkId in networkIds)
+                {
+                    Component component = networkId as Component;
+                    string path = component.transform.Path(instance.transform);
+                    
+                    GameObject ppOriginal = playerObjectTransform.Find(path).gameObject;
+                    
+                    int indexNetworkObject = sdk3Descriptor.NetworkIDCollection.FindIndex((x) => x.gameObject == ppOriginal);
+                
+                    if (indexNetworkObject == -1)
+                    {
+                        this.LogError($"Failed to locate player persistence view ID for {playerObjectTransform.name}/{path}");
+                        continue;
+                    }
+                    
+                    NetworkIDPair networkIdPair = sdk3Descriptor.NetworkIDCollection[indexNetworkObject];
+
+                    int viewId = ClientSimNetworkingUtilities.FlattenPlayerViewId(networkIdPair.ID) + baseId;
+                    
+                    ConfigureObject(component.gameObject, viewId, playerId, networkId, null, udonManager, syncedObjectManager);
+                    
+                    viewId++;
+                    
+                    if (viewId >= (playerId * ClientSimNetworkingUtilities.MaxID) +ClientSimNetworkingUtilities.MaxPlayerPersistenceID)
+                    {
+                        this.LogError("Ran out of player persistence view IDs.");
+                        break;
+                    }
+                }
+                
+                foreach (VRCStation station in instance.GetComponentsInChildren<VRCStation>()){
+                    ClientSimStationHelper.InitializeStations(station);
+                }
+                
+                instance.SetActive(true);
+            }
+            
+            IEnumerable<GameObject> withChildren = playerObjectInstances.SelectMany(obj => obj.GetComponentsInChildren<Transform>(true)).Select(t => t.gameObject);
+            PlayerPersistenceObjects = withChildren.ToArray();
+            PlayerPersistenceRootObjects = playerObjectInstances.ToArray();
+        }
+        
+        private static void ConfigureObject(
+            GameObject obj,
+            int viewId, 
+            int playerId,
+            INetworkID networkId,
+            string objectName = null,
+            IClientSimUdonManager udonManager = null,
+            IClientSimSyncedObjectManager syncedObjectManager = null)
+        {
+            VRCEnablePersistence enablePersistence = obj.GetComponentInParent<VRCEnablePersistence>(true);
+            bool SavePersistence = enablePersistence != null;
+
+            if (!obj.TryGetComponent(out ClientSimNetworkingView MainView))
+            {
+                MainView = obj.AddComponent<ClientSimNetworkingView>();
+            }
+
+            MainView.SetNetworkId(viewId);
+            MainView.SetPlayerId(playerId);
+            MainView.SetPersist(SavePersistence);
+            
+            InitilizeNetworkHolder(obj, MainView);
+
+            switch (networkId)
+            {
+                case VRCObjectPool vrcop:
+                {
+                    if (vrcop)
+                    {
+                        vrcop.NetworkConfigure();
+                        syncedObjectManager.InitializeObjectPool(vrcop);
+                    }
+                    break;
+                }
+                case VRCObjectSync vrcos:
+                {
+                    if (vrcos)
+                    {
+                        vrcos.NetworkConfigure();
+                        // the player initialization happens before the sdk has set the synced object callbacks so we need to do it here
+                        if(VRCObjectSync.OnAwake == null)
+                            syncedObjectManager.InitializeObjectSync(vrcos);
+                    }
+                    break;
+                }
+                case VRC.SDK3.Network.VRCNetworkBehaviour vrcnb3:
+                {
+                    if (vrcnb3)
+                    {
+                        vrcnb3.NetworkConfigure();  
+                    }
+
+                    break;
+                }
+                case UdonBehaviour udon:
+                {
+                    if (udon)
+                    {
+
+                        if (UdonManager.Instance.HasLoaded)
+                        {
+                            udon.IsNetworkingSupported = true;
+                            UdonManager.Instance.RegisterUdonBehaviour(udon);
+                        }
+                    }
+
+                    break;
+                }
+                case VRCPickup vrcPickup:
+                {
+                    if (vrcPickup)
+                    {
+                        ClientSimPickupHelper.InitializePickup(vrcPickup);
+                    }
+
+                    break;
+                }
+            }
+
+            IClientSimSyncable[] syncables = obj.GetComponentsInChildren<IClientSimSyncable>(true);
+            foreach (IClientSimSyncable syncable in syncables)
+            {
+                syncable.SetOwner(playerId);
+            }
+        }
+        
+        private static void InitilizeNetworkHolder(GameObject obj, ClientSimNetworkingView mainView)
+        {
+            if (!obj.TryGetComponent<ClientSimNetworkIdHolder>(out var networkIdHolder))
+            {
+                networkIdHolder = obj.AddComponent<ClientSimNetworkIdHolder>();
+                networkIdHolder.SetNetworkView(mainView);
+                networkIdHolder.SetNetworkComponents();
+                
+                mainView.AddNetworkedObject(networkIdHolder);
+            }
+        }
+
+        private void RemovePlayerPersistenceObjects()
+        {
+            for (int i = 0; i < PlayerPersistenceObjects.Length; i++)
+            {
+                Object.Destroy(PlayerPersistenceObjects[i]);
+            }
+        }
+
+        private void CheckPlayerRestored()
+        {
+            if (playerRestoredStatus.HasDecodedPlayerData && 
+                playerRestoredStatus.HasDecodedPlayerObjects && 
+                !playerRestoredStatus.PlayerRestored)
+            {
+                playerRestoredStatus.PlayerRestored = true;
+                _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONPLAYERRESTORED, ("player", Player));
+                _eventDispatcher.SendEvent(new ClientSimOnPlayerRestoredEvent
+                {
+                    player = Player
+                });
+            }
+        }
+        
+        private void OnPlayerDataDecoded(ClientSimOnPlayerDataDecodedEvent payload)
+        {
+            if (payload.player.playerId != Player.playerId) return; 
+            
+            playerRestoredStatus.HasDecodedPlayerData = true;
+            CheckPlayerRestored();
+        }
+
+        private void OnPlayerObjectsDecoded(ClientSimOnPlayerObjectsDecodedEvent payload)
+        {
+            if (payload.player.playerId != Player.playerId) return; 
+
+            playerRestoredStatus.HasDecodedPlayerObjects = true;
+            CheckPlayerRestored();
+        }
+        
+        private void OnDestroy()
+        {
+            _eventDispatcher?.Unsubscribe<ClientSimOnPlayerDataDecodedEvent>(OnPlayerDataDecoded);
+            _eventDispatcher?.Unsubscribe<ClientSimOnPlayerObjectsDecodedEvent>(OnPlayerObjectsDecoded);
+
+            RemovePlayerPersistenceObjects();
+        }
+        
+        public void EnablePlayerObjects()
+        {
+            for (int i = 0; i < PlayerPersistenceRootObjects.Length; i++)
+            {
+                PlayerPersistenceRootObjects[i].SetActive(true);
+            }
+        }
+#endif
+
         private void Start()
         {
             if (!Player.isLocal)
@@ -190,5 +473,21 @@ public Quaternion GetRotation()
             }
             return transform.rotation;
         }
+
+        public void SimulateVRCPlusGift()
+        {
+            _eventDispatcher?.SendEvent(new ClientSimOnVRCPlusMassGift
+            {
+                gifter = Player,
+                numGifts = 10,
+            });
+        }
+
+        private class ClientSimPlayerRestoredStatus
+        {
+            public bool HasDecodedPlayerData = false;
+            public bool HasDecodedPlayerObjects = false;
+            public bool PlayerRestored = false;
+        }
     }
 }
\ No newline at end of file
diff --git a/Source/Runtime/Player/ClientSimPlayerController.cs b/Source/Runtime/Player/ClientSimPlayerController.cs
index 7679e9b..124db1c 100644
--- a/Source/Runtime/Player/ClientSimPlayerController.cs
+++ b/Source/Runtime/Player/ClientSimPlayerController.cs
@@ -229,12 +229,16 @@ public void Teleport(Vector3 position, Quaternion floorRotation, bool fromPlaySp
             floorRotation = Quaternion.Euler(0, floorRotation.eulerAngles.y, 0);
             if (fromPlaySpace)
             {
-                var playspaceData = _trackingProvider.GetTrackingData(VRCPlayerApi.TrackingDataType.Origin);
-                floorRotation = Quaternion.Inverse(playspaceData.rotation) * floorRotation;
-                position = position + floorRotation * -playspaceData.position;
+                VRCPlayerApi.TrackingData playspaceData = _trackingProvider.GetTrackingData(VRCPlayerApi.TrackingDataType.Origin);
+                Vector3 playspacePos = playspaceData.position - transform.position;
+                Quaternion playspaceRot = playspaceData.rotation * Quaternion.Inverse(transform.rotation);
+                floorRotation = floorRotation * Quaternion.Inverse(playspaceRot);
+                position += floorRotation * -playspacePos;
             }
 
-            this.Log($"Moving player to {position.ToString("F3")} and rotation {floorRotation.eulerAngles.ToString("F3")}");
+            this.Log($"Moving player to {position.ToString("F3")} " +
+                     $"and rotation {floorRotation.eulerAngles.ToString("F3")} " +
+                     $"(fromPlaySpace={fromPlaySpace})");
 
             transform.rotation = floorRotation;
             transform.position = position;
diff --git a/Source/Runtime/Player/PlayerData/ClientSimPlayerAudioData.cs b/Source/Runtime/Player/PlayerData/ClientSimPlayerAudioData.cs
index d995a2a..6d4b058 100644
--- a/Source/Runtime/Player/PlayerData/ClientSimPlayerAudioData.cs
+++ b/Source/Runtime/Player/PlayerData/ClientSimPlayerAudioData.cs
@@ -20,33 +20,19 @@ public class ClientSimPlayerAudioData : IClientSimPlayerAudioData
 
         #region Player Audio
 
-        public void SetVoiceLowpass(bool value)
-        {
-            voiceLowpass = value;
-        }
-
-        public void SetVoiceVolumetricRadius(float value)
-        {
-            voiceVolumetricRadius = value;
-        }
-
-        public void SetVoiceDistanceNear(float value)
-        {
-            voiceDistanceNear = value;
-        }
-
-        public void SetVoiceDistanceFar(float value)
-        {
-            voiceDistanceFar = value;
-        }
-
-        public void SetVoiceGain(float value)
-        {
-            voiceGain = value;
-        }
+        public void SetVoiceGain(float value) => voiceGain = value;
+        public void SetVoiceDistanceNear(float value) => voiceDistanceNear = value;
+        public void SetVoiceDistanceFar(float value) => voiceDistanceFar = value;
+        public void SetVoiceVolumetricRadius(float value) => voiceVolumetricRadius = value;
+        public void SetVoiceLowpass(bool value) => voiceLowpass = value;
 
+        public float GetVoiceGain() => voiceGain;
+        public float GetVoiceDistanceNear() => voiceDistanceNear;
+        public float GetVoiceDistanceFar() => voiceDistanceFar;
+        public float GetVoiceVolumetricRadius() => voiceVolumetricRadius;
+        public bool GetVoiceLowpass() => voiceLowpass;
         #endregion
-        
+
         #region Avatar Audio
 
         public void SetAvatarAudioVolumetricRadius(float value)
diff --git a/Source/Runtime/Player/PlayerPersistence.meta b/Source/Runtime/Player/PlayerPersistence.meta
new file mode 100644
index 0000000..310252d
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dc69316ead1241668e91076f6d8027dd
+timeCreated: 1708638333
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs
new file mode 100644
index 0000000..ce4f113
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs
@@ -0,0 +1,406 @@
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    public class ClientSimPlayerDataConverter : JsonConverter<ClientSimPlayerDataTypeUnion>
+    {
+        public override ClientSimPlayerDataTypeUnion ReadJson(JsonReader reader, Type objectType, ClientSimPlayerDataTypeUnion existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JObject jsonObject = JObject.Load(reader);
+
+            if (jsonObject["type"] == null)
+            {
+                Debug.LogError("Failed to deserialize PlayerData: No type found");
+                return null;
+            }
+            if (jsonObject["value"] == null)
+            {
+                Debug.LogError("Failed to deserialize PlayerData: No value found");
+                return null;
+            }
+
+            try
+            {
+                ClientSimPlayerDataType type = GetPlayerDataType(jsonObject["type"].ToString());
+                object value = GetTypedValue(type, jsonObject["value"], reader, existingValue, serializer);
+                return new ClientSimPlayerDataTypeUnion { Type = type, Value = value };
+            }
+            catch (Exception e)
+            {
+                Debug.LogError($"Failed to parse PlayerData {objectType} : {e.Message}");
+                return default;
+            }
+        }
+
+        private ClientSimPlayerDataType GetPlayerDataType(string typeName)
+        {
+            return typeName switch
+            {
+                "Color" => ClientSimPlayerDataType.Color,
+                "Color32" => ClientSimPlayerDataType.Color32,
+                "Quaternion" => ClientSimPlayerDataType.Quaternion,
+                "Vector2" => ClientSimPlayerDataType.Vector2,
+                "Vector3" => ClientSimPlayerDataType.Vector3,
+                "Vector4" => ClientSimPlayerDataType.Vector4,
+                "Bool" => ClientSimPlayerDataType.WrappedBool,
+                "UByte" => ClientSimPlayerDataType.WrappedUByte,
+                "Byte" => ClientSimPlayerDataType.WrappedByte,
+                "Bytes" => ClientSimPlayerDataType.WrappedBytes,
+                "Float" => ClientSimPlayerDataType.WrappedFloat,
+                "Double" => ClientSimPlayerDataType.WrappedDouble,
+                "Long" => ClientSimPlayerDataType.WrappedLong,
+                "ULong" => ClientSimPlayerDataType.WrappedULong,
+                "Int" => ClientSimPlayerDataType.WrappedInt,
+                "UInt" => ClientSimPlayerDataType.WrappedUInt,
+                "Short" => ClientSimPlayerDataType.WrappedShort,
+                "UShort" => ClientSimPlayerDataType.WrappedUShort,
+                "String" => ClientSimPlayerDataType.WrappedString,
+                _ => ClientSimPlayerDataType.Color
+            };
+        }
+        
+        public override void WriteJson(JsonWriter writer, ClientSimPlayerDataTypeUnion value, JsonSerializer serializer)
+        {
+            JsonConverter converter = null;
+            if (value.Type == ClientSimPlayerDataType.Color) converter = new ColorConverter();
+            else if (value.Type == ClientSimPlayerDataType.Color32) converter = new Color32Converter();
+            else if (value.Type == ClientSimPlayerDataType.Quaternion) converter = new QuaternionConverter();
+            else if (value.Type == ClientSimPlayerDataType.Vector2) converter = new Vector2Converter();
+            else if (value.Type == ClientSimPlayerDataType.Vector3) converter = new Vector3Converter();
+            else if (value.Type == ClientSimPlayerDataType.Vector4) converter = new Vector4Converter();
+            
+            writer.WriteStartObject();
+            writer.WritePropertyName("type");
+            writer.WriteValue(value.Type.ToString().Replace("Wrapped", ""));
+            writer.WritePropertyName("value");
+            if (converter != null)
+            {
+                converter.WriteJson(writer, value.Value, serializer);
+            }
+            else
+            {
+                writer.WriteValue(value.Value);
+            }
+            writer.WriteEndObject();
+        }
+
+        private static object GetTypedValue(ClientSimPlayerDataType type, object deserializedValue, JsonReader reader, ClientSimPlayerDataTypeUnion existingValue, JsonSerializer serializer)
+        {
+            switch (type)
+            {
+                case ClientSimPlayerDataType.Color:
+                    ColorUtility.TryParseHtmlString("#" + deserializedValue, out Color loadedColor);
+                    return loadedColor;
+                
+                case ClientSimPlayerDataType.Color32:
+                    ColorUtility.TryParseHtmlString("#" + deserializedValue, out Color loadedColor32);
+                    return new Color32(
+                        (byte)(loadedColor32.r * 255), 
+                        (byte)(loadedColor32.g * 255), 
+                        (byte)(loadedColor32.b * 255), 
+                        (byte)(loadedColor32.a * 255));
+                
+                case ClientSimPlayerDataType.Quaternion:
+                    JObject quaternionObj = (JObject)deserializedValue;
+                    return new Quaternion(
+                        (float)quaternionObj["x"], 
+                        (float)quaternionObj["y"], 
+                        (float)quaternionObj["z"], 
+                        (float)quaternionObj["w"]);
+
+                case ClientSimPlayerDataType.Vector2:
+                    JObject vector2Obj = (JObject)deserializedValue;
+                    return new Vector2(
+                        (float)vector2Obj["x"], 
+                        (float)vector2Obj["y"]);
+                
+                case ClientSimPlayerDataType.Vector3:
+                    JObject vector3Obj = (JObject)deserializedValue;
+                    return new Vector3(
+                        (float)vector3Obj["x"], 
+                        (float)vector3Obj["y"], 
+                        (float)vector3Obj["z"]);
+                
+                case ClientSimPlayerDataType.Vector4:
+                    JObject vector4Obj = (JObject)deserializedValue;
+                    return new Vector4(
+                        (float)vector4Obj["x"], 
+                        (float)vector4Obj["y"], 
+                        (float)vector4Obj["z"], 
+                        (float)vector4Obj["w"]);
+                
+                case ClientSimPlayerDataType.WrappedBytes:
+                    JValue byteArrayObj = (JValue)deserializedValue;
+                    return Convert.FromBase64String((string)byteArrayObj.Value ?? string.Empty);
+
+                case ClientSimPlayerDataType.WrappedBool: return (bool)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedUByte: return (byte)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedByte: return (sbyte)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedFloat: return (float)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedDouble: return (double)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedLong: return (long)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedULong: return (ulong)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedInt: return (int)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedUInt: return (uint)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedShort: return (short)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedUShort: return (ushort)(JValue)deserializedValue;
+                case ClientSimPlayerDataType.WrappedString: return (string)(JValue)deserializedValue;
+                default: return deserializedValue;
+            }
+        }
+    }
+
+    internal class ColorConverter : JsonConverter<Color>
+    {
+        public override Color ReadJson(JsonReader reader, Type objectType, Color existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                ColorUtility.TryParseHtmlString("#" + reader.Value, out Color loadedColor);
+                return loadedColor;
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse color {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, Color color, JsonSerializer serializer)
+        {
+            string val = ColorUtility.ToHtmlStringRGBA(color);
+            writer.WriteValue(val);
+        }
+    }
+    
+    internal class Color32Converter : JsonConverter<Color32>
+    {
+        public override Color32 ReadJson(JsonReader reader, Type objectType, Color32 existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                ColorUtility.TryParseHtmlString("#" + reader.Value, out Color loadedColor);
+                return loadedColor;
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse color {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, Color32 color, JsonSerializer serializer)
+        {
+            string val = ColorUtility.ToHtmlStringRGBA(color);
+            writer.WriteValue(val);
+        }
+    }
+    
+    internal class QuaternionConverter : JsonConverter<Quaternion>
+    {
+        public override Quaternion ReadJson(JsonReader reader, Type objectType, Quaternion existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try 
+            {
+                Debug.Log($"Quaternion: type={objectType} ({existingValue.GetType()}), val={existingValue}");
+
+                float x = 0f, y = 0f, z = 0f, w = 0f;
+                while (reader.Read())
+                {
+                    string propertyName = (string)reader.Value;
+
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "x":
+                            x = Convert.ToSingle(reader.Value);
+                            break;
+                        case "y":
+                            y = Convert.ToSingle(reader.Value);
+                            break;
+                        case "z":
+                            z = Convert.ToSingle(reader.Value);
+                            break;
+                        case "w":
+                            w = Convert.ToSingle(reader.Value);
+                            break;
+                    }
+                }
+
+                return new Quaternion(x, y, z, w);
+            }
+        
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse quaternion {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, Quaternion value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+            writer.WritePropertyName("x");
+            writer.WriteValue(value.x);
+            writer.WritePropertyName("y");
+            writer.WriteValue(value.y);
+            writer.WritePropertyName("z");
+            writer.WriteValue(value.z);
+            writer.WritePropertyName("w");
+            writer.WriteValue(value.w);
+            writer.WriteEndObject();
+        }
+    }
+    
+    public class Vector2Converter : JsonConverter<Vector2>
+    {
+        public override Vector2 ReadJson(JsonReader reader, Type objectType, Vector2 existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                float x = 0f, y = 0f;
+                while (reader.Read())
+                {
+                    string propertyName = (string)reader.Value;
+
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "x":
+                            x = Convert.ToSingle(reader.Value);
+                            break;
+                        case "y":
+                            y = Convert.ToSingle(reader.Value);
+                            break;
+                    }
+                }
+
+                return new Vector2(x, y);
+            }
+        
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse Vector2 {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+        
+        public override void WriteJson(JsonWriter writer, Vector2 value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+            writer.WritePropertyName("x");
+            writer.WriteValue(value.x);
+            writer.WritePropertyName("y");
+            writer.WriteValue(value.y);
+            writer.WriteEndObject();
+        }
+    }
+    
+    public class Vector3Converter : JsonConverter<Vector3>
+    {
+        public override Vector3 ReadJson(JsonReader reader, Type objectType, Vector3 existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                float x = 0f, y = 0f, z = 0f;
+                while (reader.Read())
+                {
+                    string propertyName = (string)reader.Value;
+
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "x":
+                            x = Convert.ToSingle(reader.Value);
+                            break;
+                        case "y":
+                            y = Convert.ToSingle(reader.Value);
+                            break;
+                        case "z":
+                            z = Convert.ToSingle(reader.Value);
+                            break;
+                    }
+                }
+
+                return new Vector3(x, y, z);
+            }
+        
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse Vector3 {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+        
+        public override void WriteJson(JsonWriter writer, Vector3 value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+            writer.WritePropertyName("x");
+            writer.WriteValue(value.x);
+            writer.WritePropertyName("y");
+            writer.WriteValue(value.y);
+            writer.WritePropertyName("z");
+            writer.WriteValue(value.z);
+            writer.WriteEndObject();
+        }
+    }
+    
+    public class Vector4Converter : JsonConverter<Vector4>
+    {
+        public override Vector4 ReadJson(JsonReader reader, Type objectType, Vector4 existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            try 
+            {
+                float x = 0f, y = 0f, z = 0f, w = 0f;
+                while (reader.Read())
+                {
+                    string propertyName = (string)reader.Value;
+
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "x":
+                            x = Convert.ToSingle(reader.Value);
+                            break;
+                        case "y":
+                            y = Convert.ToSingle(reader.Value);
+                            break;
+                        case "z":
+                            z = Convert.ToSingle(reader.Value);
+                            break;
+                        case "w":
+                            w = Convert.ToSingle(reader.Value);
+                            break;
+                    }
+                }
+
+                return new Vector4(x, y, z, w);
+            }
+        
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to parse Vector4 {objectType} : {ex.Message}");
+                return default;
+            }
+        }
+        
+        public override void WriteJson(JsonWriter writer, Vector4 value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+            writer.WritePropertyName("x");
+            writer.WriteValue(value.x);
+            writer.WritePropertyName("y");
+            writer.WriteValue(value.y);
+            writer.WritePropertyName("z");
+            writer.WriteValue(value.z);
+            writer.WritePropertyName("w");
+            writer.WriteValue(value.w);
+            writer.WriteEndObject();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs.meta
new file mode 100644
index 0000000..44932e6
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataConverter.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d47ee12e2ac84367b7e3ced0dc76be28
+timeCreated: 1708717453
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs
new file mode 100644
index 0000000..22dcfb8
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs
@@ -0,0 +1,20 @@
+using System;
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    public class ClientSimPlayerDataPair
+    {
+        public string Key { get; set; }
+        public ClientSimPlayerDataTypeUnion Value { get; set; }
+        public DateTime LastUpdated;
+
+
+        public ClientSimPlayerDataPair() {
+            Key = null;
+            Value = null;
+            LastUpdated = DateTime.Now;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs.meta
new file mode 100644
index 0000000..a9c9cf5
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataPair.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7da7fcefc4434d3e9b5e16edf46de990
+timeCreated: 1708638443
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs
new file mode 100644
index 0000000..1f416ea
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs
@@ -0,0 +1,864 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
+using UnityEngine;
+using VRC.SDKBase;
+
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using UnityEngine.SceneManagement;
+using VRC.SDK3.Persistence;
+using VRC.Udon;
+#endif
+
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    [AddComponentMenu("")] // hides component in Add Component menu
+    public class ClientSimPlayerDataStorage : ClientSimBehaviour
+    {
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+        public static string PlayerDataFolder => Path.Combine("ClientSimStorage", "PlayerData");
+        internal static string PlayerDataFilePath(VRCPlayerApi player) 
+        {
+            string root = Path.GetDirectoryName(Application.dataPath);
+            string path = Path.Combine(root, PlayerDataFolder);
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+            return path + "/PlayerData_" + $"{player.playerId}" + $"_{SceneManager.GetActiveScene().name}" + ".json";
+        }
+
+        private VRCPlayerApi _player;
+        private IClientSimUdonEventSender _udonEventSender;
+        private IClientSimEventDispatcher _eventDispatcher;
+        
+        private readonly Dictionary<string, ClientSimPlayerDataPair> leData = new();
+        private readonly Dictionary<string, PlayerData.Info> localInfoChanges = new();
+        private readonly List<PlayerData.Info> queuedPlayerDataUpdates = new();
+
+        private bool doDecode;
+        private bool isDoneDecoding;
+        private bool hasPostedPlayerDataDecoded;
+        private bool hasPostedPlayerRestored;
+
+        public IEnumerable<string> GetKeys()
+        {
+            return leData.Keys;
+        }
+        
+        public bool HasKey(string key) => leData.ContainsKey(key);
+
+        public Type GetType(string key)
+        {
+            if (!leData.TryGetValue(key, out ClientSimPlayerDataPair value))
+                return null;
+
+            switch (value.Value.Type)
+            {
+                default:
+                case ClientSimPlayerDataType.None:
+                    return null;
+                case ClientSimPlayerDataType.Vector2:
+                    return typeof(Vector2);
+                case ClientSimPlayerDataType.Vector3:
+                    return typeof(Vector3);
+                case ClientSimPlayerDataType.Vector4:
+                    return typeof(Vector4);
+                case ClientSimPlayerDataType.Quaternion:
+                    return typeof(Quaternion);
+                case ClientSimPlayerDataType.Color:
+                    return typeof(Color);
+                case ClientSimPlayerDataType.Color32:
+                    return typeof(Color32);
+                case ClientSimPlayerDataType.WrappedString:
+                    return typeof(string);
+                case ClientSimPlayerDataType.WrappedShort:
+                    return typeof(short);
+                case ClientSimPlayerDataType.WrappedUShort:
+                    return typeof(ushort);
+                case ClientSimPlayerDataType.WrappedInt:
+                    return typeof(int);
+                case ClientSimPlayerDataType.WrappedUInt:
+                    return typeof(uint);
+                case ClientSimPlayerDataType.WrappedLong:
+                    return typeof(long);
+                case ClientSimPlayerDataType.WrappedULong:
+                    return typeof(ulong);
+                case ClientSimPlayerDataType.WrappedFloat:
+                    return typeof(float);
+                case ClientSimPlayerDataType.WrappedDouble:
+                    return typeof(double);
+                case ClientSimPlayerDataType.WrappedBool:
+                    return typeof(bool);
+                case ClientSimPlayerDataType.WrappedByte:
+                    return typeof(sbyte);
+                case ClientSimPlayerDataType.WrappedUByte:
+                    return typeof(byte);
+                case ClientSimPlayerDataType.WrappedBytes:
+                    return typeof(byte[]);
+            }
+        }
+        
+#region Setters
+
+        private PlayerData.State _SetWrapper(string key, Func<ClientSimPlayerDataPair, bool> set, bool isRestore, bool flushChanges, DateTime lastUpdated)
+        {
+            if (string.IsNullOrWhiteSpace(key))
+                throw new ArgumentException("Key was invalid");
+
+            if (!isRestore && leData.TryGetValue(key, out ClientSimPlayerDataPair value))
+            {
+                if (set(value))
+                {
+                    value.LastUpdated = DateTime.Now;
+                    localInfoChanges[key] = new PlayerData.Info(key, PlayerData.State.Changed);
+                    if (flushChanges)
+                    {
+                        FlushLocalInfoChanges();
+                    }
+                    return PlayerData.State.Changed;
+                }
+                return PlayerData.State.Unchanged;
+            }
+
+            value = new ClientSimPlayerDataPair { Key = key, LastUpdated = isRestore ? lastUpdated : DateTime.Now };
+            leData[key] = value;
+            set(value);
+
+            var state = isRestore ? PlayerData.State.Restored : PlayerData.State.Added;
+            localInfoChanges[key] = new PlayerData.Info(key, state);
+            if (flushChanges)
+            {
+                FlushLocalInfoChanges();
+            }
+            return state;
+        }
+        
+        public PlayerData.State SetBool(string key, bool value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedBool)
+                {
+                    if (pair.Value.AsWrappedBool() == value)
+                        return false; 
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedBool,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetByte(string key, byte value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedUByte)
+                {
+                    if (pair.Value.AsWrappedUByte() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedUByte,
+                        Value = value
+                    };
+                
+                return true;
+            }
+        }
+        public PlayerData.State SetSByte(string key, sbyte value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedByte)
+                {
+                    if (pair.Value.AsWrappedSByte() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedByte,
+                        Value = value
+                    };
+                
+                return true;
+            }
+        }
+        public PlayerData.State SetBytes(string key, byte[] value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedBytes)
+                {
+                    if (pair.Value.AsWrappedBytes().SequenceEqual(value))
+                        return false;
+                    
+                    pair.Value.Value = value.ToArray();
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedBytes,
+                        Value = value.ToArray()
+                    };
+                
+                return true;
+            }
+        }
+        public PlayerData.State SetString(string key, string value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedString)
+                {
+                    if (pair.Value.AsWrappedString() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedString,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetShort(string key, short value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedShort)
+                {
+                    if (pair.Value.AsWrappedShort() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedShort,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetUShort(string key, ushort value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedUShort)
+                {
+                    if (pair.Value.AsWrappedUShort() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedUShort,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetInt(string key, int value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedInt)
+                {
+                    if (pair.Value.AsWrappedInt() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedInt,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetUInt(string key, uint value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedUInt)
+                {
+                    if (pair.Value.AsWrappedUInt() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedUInt,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetLong(string key, long value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedLong)
+                {
+                    if (pair.Value.AsWrappedLong() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedLong,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetULong(string key, ulong value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedULong)
+                {
+                    if (pair.Value.AsWrappedULong() == value)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedULong,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetFloat(string key, float value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedFloat)
+                {
+                    if (Math.Abs(pair.Value.AsWrappedFloat() - value) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedFloat,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetDouble(string key, double value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.WrappedDouble)
+                {
+                    if (Math.Abs(pair.Value.AsWrappedDouble() - value) < 0.000001)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.WrappedDouble,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetVector2(string key, Vector2 value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Vector2)
+                {
+                    if (Math.Abs(pair.Value.AsVector2().x - value.x) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector2().y - value.y) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Vector2,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetVector3(string key, Vector3 value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Vector3)
+                {
+                    if (Math.Abs(pair.Value.AsVector3().x - value.x) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector3().y - value.y) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector3().z - value.z) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Vector3,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetVector4(string key, Vector4 value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Vector4)
+                {
+                    if (Math.Abs(pair.Value.AsVector4().x - value.x) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector4().y - value.y) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector4().z - value.z) < 0.000001f
+                        && Math.Abs(pair.Value.AsVector4().w - value.w) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Vector4,
+                        Value = value
+                    };
+                return true;
+            }
+        }
+        public PlayerData.State SetQuaternion(string key, Quaternion value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Quaternion)
+                {
+                    if (Math.Abs(pair.Value.AsQuaternion().x - value.x) < 0.000001f
+                        && Math.Abs(pair.Value.AsQuaternion().y - value.y) < 0.000001f
+                        && Math.Abs(pair.Value.AsQuaternion().z - value.z) < 0.000001f
+                        && Math.Abs(pair.Value.AsQuaternion().w - value.w) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Quaternion,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetColor(string key, Color value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Color)
+                {
+                    var color = pair.Value.AsColor();
+                    if (Math.Abs(color.r - value.r) < 0.01f
+                        && Math.Abs(color.g - value.g) < 0.01f
+                        && Math.Abs(color.b - value.b) < 0.01f
+                        && Math.Abs(color.a - value.a) < 0.01f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Color,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+        public PlayerData.State SetColor32(string key, Color32 value, DateTime lastUpdated = new DateTime(), bool isRestore = false, bool flushChanges = true)
+        {
+            return _SetWrapper(key, Set, isRestore, flushChanges, lastUpdated);
+            
+            bool Set(ClientSimPlayerDataPair pair)
+            {
+                if (pair.Value?.Type == ClientSimPlayerDataType.Color32)
+                {
+                    var color32 = pair.Value.AsColor32();
+                    if (Math.Abs(color32.r - value.r) < 0.000001f
+                        && Math.Abs(color32.g - value.g) < 0.000001f
+                        && Math.Abs(color32.b - value.b) < 0.000001f
+                        && Math.Abs(color32.a - value.a) < 0.000001f)
+                        return false;
+                    pair.Value.Value = value;
+                }
+                else
+                    pair.Value = new ClientSimPlayerDataTypeUnion()
+                    {
+                        Type = ClientSimPlayerDataType.Color32,
+                        Value = value
+                    };
+
+                return true;
+            }
+        }
+#endregion
+
+#region Getters
+
+        private ClientSimPlayerDataPair _GetChecked(string key, ClientSimPlayerDataType expectedType)
+        {
+            if (string.IsNullOrWhiteSpace(key))
+                throw new ArgumentException("Key was invalid");
+            if (!leData.TryGetValue(key, out ClientSimPlayerDataPair data) || data.Value == null)
+            {
+                return null;
+            }
+
+            if (data.Value.Type != expectedType)
+            {
+                this.LogError($"Data at {key} was not a {expectedType}, it was a {data.Value.Type}");
+                return null;
+            }
+            return data;
+        }
+
+        public bool GetBool(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedBool)?.Value.AsWrappedBool() ?? default;
+
+        public byte GetByte(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedUByte)?.Value.AsWrappedUByte() ?? default;
+        
+        public sbyte GetSByte(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedByte)?.Value.AsWrappedSByte() ?? default;
+
+        public byte[] GetBytes(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedBytes)?.Value.AsWrappedBytes().ToArray();
+
+        public string GetString(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedString)?.Value.AsWrappedString();
+
+        public short GetShort(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedShort)?.Value.AsWrappedShort() ?? default;
+
+        public ushort GetUShort(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedUShort)?.Value.AsWrappedUShort() ?? default;
+
+        public int GetInt(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedInt)?.Value.AsWrappedInt() ?? default;
+
+        public uint GetUInt(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedUInt)?.Value.AsWrappedUInt() ?? default;
+
+        public long GetLong(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedLong)?.Value.AsWrappedLong() ?? default;
+
+        public ulong GetULong(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedULong)?.Value.AsWrappedULong() ?? default;
+
+        public float GetFloat(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedFloat)?.Value.AsWrappedFloat() ?? default;
+
+        public double GetDouble(string key)
+            => _GetChecked(key, ClientSimPlayerDataType.WrappedDouble)?.Value.AsWrappedDouble() ?? default;
+
+        public Vector2 GetVector2(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Vector2);
+            if (data != null)
+                return new Vector2(data.Value.AsVector2().x, data.Value.AsVector2().y);
+            return default;
+        }
+
+        public Vector3 GetVector3(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Vector3);
+            if (data != null)
+                return new Vector3(data.Value.AsVector3().x, data.Value.AsVector3().y, data.Value.AsVector3().z);
+            return default;
+        }
+
+        public Vector4 GetVector4(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Vector4);
+            if (data != null)
+                return new Vector4(data.Value.AsVector4().x, data.Value.AsVector4().y, data.Value.AsVector4().z, data.Value.AsVector4().w);
+            return default;
+        }
+
+        public Quaternion GetQuaternion(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Quaternion);
+            if (data != null)
+                return new Quaternion(data.Value.AsQuaternion().x, data.Value.AsQuaternion().y, data.Value.AsQuaternion().z, data.Value.AsQuaternion().w);
+            return default;
+        }
+
+        public Color GetColor(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Color);
+            if (data != null)
+                return new Color(data.Value.AsColor().r, data.Value.AsColor().g, data.Value.AsColor().b, data.Value.AsColor().a);
+            return default;
+        }
+
+        public Color32 GetColor32(string key)
+        {
+            ClientSimPlayerDataPair data = _GetChecked(key, ClientSimPlayerDataType.Color32);
+            if (data != null)
+                return new Color32(data.Value.AsColor32().r, data.Value.AsColor32().g, data.Value.AsColor32().b, data.Value.AsColor32().a);
+            return default;
+        }
+
+#endregion
+
+#region DataPropagation
+
+        // can't decode json here because this is called before scene manager is ready
+        public void Init(VRCPlayerApi player, IClientSimUdonEventSender udonEventSender, IClientSimEventDispatcher eventDispatcher)
+        {
+            _player = player;
+            _udonEventSender = udonEventSender;
+            _eventDispatcher = eventDispatcher;
+
+            _eventDispatcher.Subscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+            _eventDispatcher.Subscribe<ClientSimOnPlayerDataClearedEvent>(OnPlayerDataCleared);
+            _eventDispatcher.Subscribe<ClientSimOnPlayerRestoredEvent>(OnPlayerRestored);
+        }
+
+        private void OnDestroy()
+        {
+            _eventDispatcher.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+            _eventDispatcher.Unsubscribe<ClientSimOnPlayerDataClearedEvent>(OnPlayerDataCleared);
+            _eventDispatcher.Unsubscribe<ClientSimOnPlayerRestoredEvent>(OnPlayerRestored);
+        }
+
+        private void OnPlayerJoined(ClientSimOnPlayerJoinedEvent payload)
+        {
+            // remote player test data is decoded via ClientSimPlayerDataWindow.OnPlayerJoined
+            if (payload.player.playerId == _player.playerId)
+                doDecode = true;
+        }
+
+        private void OnPlayerDataCleared(ClientSimOnPlayerDataClearedEvent payload)
+        {
+            leData.Clear();
+        }
+        
+        private void OnPlayerRestored(ClientSimOnPlayerRestoredEvent payload)
+        {
+            if (payload.player.isLocal)
+                hasPostedPlayerRestored = true;
+        }
+
+        private void Encode()
+        {
+            // PlayerData updates before OnPlayerRestored are ignored 
+            if (!hasPostedPlayerRestored)
+                return;
+            
+            string json = JsonConvert.SerializeObject(leData, Formatting.Indented, new JsonSerializerSettings
+            {
+                ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+            });
+            File.WriteAllText(PlayerDataFilePath(_player), json);
+        }
+        
+        internal void Decode(bool isRestore)
+        {
+            string path = PlayerDataFilePath(_player);
+            
+            if (!File.Exists(path))
+            {
+                File.WriteAllText(path, "{}");
+            }
+            else
+            {
+                try
+                {
+                    string json = File.ReadAllText(path);
+                    var data = JsonConvert.DeserializeObject<Dictionary<string, ClientSimPlayerDataPair>>(json);
+                    foreach (KeyValuePair<string, ClientSimPlayerDataPair> kvp in data)
+                    {
+                        Set(kvp.Value);
+                    }
+
+                    FlushLocalInfoChanges(); // bulk flush changes
+                }
+                catch (Exception e)
+                {
+                    this.LogError($"Error initializing PlayerData: {e.Message}");
+                }
+            }
+
+            isDoneDecoding = true;
+            
+            PlayerData.State Set(ClientSimPlayerDataPair pair)
+            {
+                try
+                {
+                    switch (pair.Value.Type)
+                    {
+                        case ClientSimPlayerDataType.Color: return SetColor(pair.Key, pair.Value.AsColor(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.Color32: return SetColor32(pair.Key, pair.Value.AsColor32(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.Quaternion: return SetQuaternion(pair.Key, pair.Value.AsQuaternion(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.Vector2: return SetVector2(pair.Key, pair.Value.AsVector2(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.Vector3: return SetVector3(pair.Key, pair.Value.AsVector3(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.Vector4: return SetVector4(pair.Key, pair.Value.AsVector4(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedBool: return SetBool(pair.Key, pair.Value.AsWrappedBool(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedByte: return SetSByte(pair.Key, pair.Value.AsWrappedSByte(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedUByte: return SetByte(pair.Key, pair.Value.AsWrappedByte(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedBytes: return SetBytes(pair.Key, pair.Value.AsWrappedBytes(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedFloat: return SetFloat(pair.Key, pair.Value.AsWrappedFloat(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedDouble: return SetDouble(pair.Key, pair.Value.AsWrappedDouble(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedLong: return SetLong(pair.Key, pair.Value.AsWrappedLong(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedULong: return SetULong(pair.Key, pair.Value.AsWrappedULong(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedInt: return SetInt(pair.Key, pair.Value.AsWrappedInt(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedUInt: return SetUInt(pair.Key, pair.Value.AsWrappedUInt(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedShort: return SetShort(pair.Key, pair.Value.AsWrappedShort(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedUShort: return SetUShort(pair.Key, pair.Value.AsWrappedUShort(), pair.LastUpdated, isRestore, false);
+                        case ClientSimPlayerDataType.WrappedString: return SetString(pair.Key, pair.Value.AsWrappedString(), pair.LastUpdated, isRestore, false);
+                        
+                        default:
+                        case ClientSimPlayerDataType.None: return PlayerData.State.Unchanged;
+                    }
+                }
+                catch (Exception e)
+                {
+                    this.LogError("Error reading PlayerData: " +
+                                  $"key={pair.Key}, " +
+                                  $"type={pair.Value.Type} ({pair.Value.Value.GetType()}), " +
+                                  $"value={pair.Value.Value}, " +
+                                  $"error={e.Message}");
+                    return default;
+                }
+            }
+        }
+        
+        private void FlushLocalInfoChanges()
+        {
+            var infos = leData
+                .Select(kvp =>
+                    localInfoChanges.TryGetValue(kvp.Key, out var value)
+                        ? value
+                        : new PlayerData.Info(kvp.Key, PlayerData.State.Unchanged))
+                .ToArray();
+
+            QueuePlayerDataUpdate(infos);
+            
+            localInfoChanges.Clear();
+        }
+        
+        internal void QueuePlayerDataUpdate(PlayerData.Info[] infos)
+        {
+            if (infos.Length == 0) 
+                return;
+
+            queuedPlayerDataUpdates.AddRange(infos);
+        }
+
+        private void RaisePlayerDataUpdated(PlayerData.Info[] infos)
+        {
+            _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONPLAYERDATAUPDATED, ("player", _player), ("infos", infos));
+            _eventDispatcher.SendEvent(new ClientSimOnPlayerDataUpdatedEvent
+            {
+                player = _player,
+                playerData = leData
+            });
+        }
+
+        private void LateUpdate()
+        {
+            if (queuedPlayerDataUpdates.Count > 0)
+            {
+                Encode();
+                RaisePlayerDataUpdated(queuedPlayerDataUpdates.ToArray());
+                queuedPlayerDataUpdates.Clear();
+            }
+
+            if (doDecode)
+            {
+                doDecode = false;
+                Decode(true);
+            }
+            else if (isDoneDecoding && !hasPostedPlayerDataDecoded)
+            {
+                hasPostedPlayerDataDecoded = true;
+                _eventDispatcher.SendEvent(new ClientSimOnPlayerDataDecodedEvent { player = _player });
+            }
+        }
+        
+#endregion
+
+#endif
+    }
+}
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs.meta
new file mode 100644
index 0000000..f28211f
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataStorage.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0ef04bdeba52437cb909dc841044fd57
+timeCreated: 1708619978
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs
new file mode 100644
index 0000000..2d30332
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs
@@ -0,0 +1,28 @@
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    public enum ClientSimPlayerDataType : byte
+    {
+        None = 0,
+        Vector2 = 1,
+        Vector3 = 2,
+        Vector4 = 3,
+        Quaternion = 4,
+        Color = 5,
+        Color32 = 6,
+        WrappedString = 7,
+        WrappedShort = 8,
+        WrappedInt = 9,
+        WrappedFloat = 10,
+        WrappedBool = 11,
+        WrappedByte = 12,
+        WrappedBytes = 13,
+        WrappedUShort = 14,
+        WrappedUByte = 15,
+        WrappedUInt = 16,
+        WrappedULong = 17,
+        WrappedDouble = 18,
+        WrappedLong = 19,
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs.meta
new file mode 100644
index 0000000..1aa05be
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataType.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ee1e38bff02f4812896fb863095a29ad
+timeCreated: 1708638423
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs
new file mode 100644
index 0000000..69fbf8b
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs
@@ -0,0 +1,39 @@
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using Newtonsoft.Json;
+using UnityEngine;
+
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    [JsonConverter(typeof(ClientSimPlayerDataConverter))] 
+    public class ClientSimPlayerDataTypeUnion
+    {
+        public object Value { get; set; }
+        public ClientSimPlayerDataType Type { get; set; }
+        public ClientSimPlayerDataTypeUnion() {
+            this.Type = ClientSimPlayerDataType.None;
+            this.Value = null;
+        }
+
+        public Vector2 AsVector2() => (Vector2)Value;
+        public Vector3 AsVector3() => (Vector3)Value;
+        public Vector4 AsVector4() => (Vector4)Value;
+        public Quaternion AsQuaternion() => (Quaternion)Value;
+        public Color AsColor() => (Color)Value;
+        public Color32 AsColor32() => (Color32)Value;
+        public string AsWrappedString() { return (string)Value; }
+        public short AsWrappedShort() { return (short)Value; }
+        public ushort AsWrappedUShort() { return (ushort)Value; }
+        public int AsWrappedInt() { return (int)Value; }
+        public uint AsWrappedUInt() { return (uint)Value; }
+        public long AsWrappedLong() { return (long)Value; }
+        public ulong AsWrappedULong() { return ( ulong)Value; }
+        public float AsWrappedFloat() { return ( float)Value; }
+        public double AsWrappedDouble() { return (double)Value; }
+        public bool AsWrappedBool() { return (bool)Value; }
+        public byte AsWrappedByte() { return (byte)Value ; }
+        public sbyte AsWrappedSByte() { return (sbyte)Value; }
+        public byte[] AsWrappedBytes() { return (byte[])Value; }
+        public byte AsWrappedUByte() { return (byte)Value; }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs.meta
new file mode 100644
index 0000000..88436d4
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataTypeUnion.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 53d85c02f89642f49608b67f2788c77a
+timeCreated: 1708638433
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs
new file mode 100644
index 0000000..df95d0a
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs
@@ -0,0 +1,469 @@
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+using VRC.SDKBase;
+
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    public static class ClientSimPlayerDataWrapper
+    {
+        public static void ConfigureSDK()
+        {
+            System.Func<VRCPlayerApi, IEnumerable<string>> _getKeys = GetKeys;
+
+            FieldInfo getKeysInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getKeys", BindingFlags.Static | BindingFlags.NonPublic);
+            getKeysInfo?.SetValue(null, _getKeys);
+            
+            System.Func<VRCPlayerApi, string, bool> _hasKey = HasKey;
+
+            FieldInfo hasKeyInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_hasKey", BindingFlags.Static | BindingFlags.NonPublic);
+            hasKeyInfo?.SetValue(null, _hasKey);
+            
+            System.Func<VRCPlayerApi, string, Type> _getType = GetType;
+
+            FieldInfo getTypeInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getType", BindingFlags.Static | BindingFlags.NonPublic);
+            getTypeInfo?.SetValue(null, _getType);
+
+            System.Action<string, bool> _setBool = SetBool;
+            System.Func<VRCPlayerApi, string, bool> _getBool = GetBool;
+
+            FieldInfo setBoolInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setBool", BindingFlags.Static | BindingFlags.NonPublic);
+            setBoolInfo?.SetValue(null, _setBool);
+            
+            FieldInfo getBoolInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getBool", BindingFlags.Static | BindingFlags.NonPublic);
+            getBoolInfo?.SetValue(null, _getBool);
+            
+            System.Action<string, byte> _setByte = SetByte;
+            System.Func<VRCPlayerApi, string, byte> _getByte = GetByte;
+
+            FieldInfo setByteInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setByte", BindingFlags.Static | BindingFlags.NonPublic);
+            setByteInfo?.SetValue(null, _setByte);
+            
+            FieldInfo getByteInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getByte", BindingFlags.Static | BindingFlags.NonPublic);
+            getByteInfo?.SetValue(null, _getByte);
+            
+            System.Action<string, sbyte> _setUByte = SetSByte;
+            System.Func<VRCPlayerApi, string, sbyte> _getUByte = GetSByte;
+            
+            FieldInfo setUByteInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setSByte", BindingFlags.Static | BindingFlags.NonPublic);
+            setUByteInfo?.SetValue(null, _setUByte);
+            
+            FieldInfo getUByteInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getSByte", BindingFlags.Static | BindingFlags.NonPublic);
+            getUByteInfo?.SetValue(null, _getUByte);
+            
+            System.Action<string, byte[]> _setBytes = SetBytes;
+            System.Func<VRCPlayerApi, string, byte[]> _getBytes = GetBytes;
+
+            FieldInfo setBytesInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setBytes", BindingFlags.Static | BindingFlags.NonPublic);
+            setBytesInfo?.SetValue(null, _setBytes);
+            
+            FieldInfo getBytesInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getBytes", BindingFlags.Static | BindingFlags.NonPublic);
+            getBytesInfo?.SetValue(null, _getBytes);
+            
+            System.Action<string, string> _setString = SetString;
+            System.Func<VRCPlayerApi, string, string> _getString = GetString;
+
+            FieldInfo setStringInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setString", BindingFlags.Static | BindingFlags.NonPublic);
+            setStringInfo?.SetValue(null, _setString);
+            
+            FieldInfo getStringInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getString", BindingFlags.Static | BindingFlags.NonPublic);
+            getStringInfo?.SetValue(null, _getString);
+            
+            System.Action<string, short> _setShort = SetShort;
+            System.Func<VRCPlayerApi, string, short> _getShort = GetShort;
+
+            FieldInfo setShortInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setShort", BindingFlags.Static | BindingFlags.NonPublic);
+            setShortInfo?.SetValue(null, _setShort);
+            
+            FieldInfo getShortInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getShort", BindingFlags.Static | BindingFlags.NonPublic);
+            getShortInfo?.SetValue(null, _getShort);
+            
+            System.Action<string, ushort> _setUShort = SetUShort;
+            System.Func<VRCPlayerApi, string, ushort> _getUShort = GetUShort;
+
+            FieldInfo setUShortInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setUShort", BindingFlags.Static | BindingFlags.NonPublic);
+            setUShortInfo?.SetValue(null, _setUShort);
+            
+            FieldInfo getUShortInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getUShort", BindingFlags.Static | BindingFlags.NonPublic);
+            getUShortInfo?.SetValue(null, _getUShort);
+            
+            System.Action<string, int> _setInt = SetInt;
+            System.Func<VRCPlayerApi, string, int> _getInt = GetInt;
+
+            FieldInfo setIntInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setInt", BindingFlags.Static | BindingFlags.NonPublic);
+            setIntInfo?.SetValue(null, _setInt);
+            
+            FieldInfo getIntInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getInt", BindingFlags.Static | BindingFlags.NonPublic);
+            getIntInfo?.SetValue(null, _getInt);
+            
+            System.Action<string, uint> _setUInt = SetUInt;
+            System.Func<VRCPlayerApi, string, uint> _getUInt = GetUInt;
+
+            FieldInfo setUIntInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setUInt", BindingFlags.Static | BindingFlags.NonPublic);
+            setUIntInfo?.SetValue(null, _setUInt);
+            
+            FieldInfo getUIntInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getUInt", BindingFlags.Static | BindingFlags.NonPublic);
+            getUIntInfo?.SetValue(null, _getUInt);
+            
+            System.Action<string, long> _setLong = SetLong;
+            System.Func<VRCPlayerApi, string, long> _getLong = GetLong;
+            
+            FieldInfo setLongInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setLong", BindingFlags.Static | BindingFlags.NonPublic);
+            setLongInfo?.SetValue(null, _setLong);
+            
+            FieldInfo getLongInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getLong", BindingFlags.Static | BindingFlags.NonPublic);
+            getLongInfo?.SetValue(null, _getLong);
+            
+            System.Action<string, ulong> _setULong = SetULong;
+            System.Func<VRCPlayerApi, string, ulong> _getULong = GetULong;
+            
+            FieldInfo setULongInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setULong", BindingFlags.Static | BindingFlags.NonPublic);
+            setULongInfo?.SetValue(null, _setULong);
+            
+            FieldInfo getULongInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getULong", BindingFlags.Static | BindingFlags.NonPublic);
+            getULongInfo?.SetValue(null, _getULong);
+            
+            System.Action<string, double> _setDouble = SetDouble;
+            System.Func<VRCPlayerApi, string, double> _getDouble = GetDouble;
+            
+            FieldInfo setDoubleInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setDouble", BindingFlags.Static | BindingFlags.NonPublic);
+            setDoubleInfo?.SetValue(null, _setDouble);
+            
+            FieldInfo getDoubleInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getDouble", BindingFlags.Static | BindingFlags.NonPublic);
+            getDoubleInfo?.SetValue(null, _getDouble);
+            
+            System.Action<string, float> _setFloat = SetFloat;
+            System.Func<VRCPlayerApi, string, float> _getFloat = GetFloat;
+
+            FieldInfo setFloatInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setFloat", BindingFlags.Static | BindingFlags.NonPublic);
+            setFloatInfo?.SetValue(null, _setFloat);
+            
+            FieldInfo getFloatInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getFloat", BindingFlags.Static | BindingFlags.NonPublic);
+            getFloatInfo?.SetValue(null, _getFloat);
+            
+            System.Action<string, Vector2> _setVector2 = SetVector2;
+            System.Func<VRCPlayerApi, string, Vector2> _getVector2 = GetVector2;
+
+            FieldInfo setVector2Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setVector2", BindingFlags.Static | BindingFlags.NonPublic);
+            setVector2Info?.SetValue(null, _setVector2);
+            
+            FieldInfo getVector2Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getVector2", BindingFlags.Static | BindingFlags.NonPublic);
+            getVector2Info?.SetValue(null, _getVector2);
+            
+            System.Action<string, Vector3> _setVector3 = SetVector3;
+            System.Func<VRCPlayerApi, string, Vector3> _getVector3 = GetVector3;
+
+            FieldInfo setVector3Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setVector3", BindingFlags.Static | BindingFlags.NonPublic);
+            setVector3Info?.SetValue(null, _setVector3);
+            
+            FieldInfo getVector3Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getVector3", BindingFlags.Static | BindingFlags.NonPublic);
+            getVector3Info?.SetValue(null, _getVector3);
+            
+            System.Action<string, Vector4> _setVector4 = SetVector4;
+            System.Func<VRCPlayerApi, string, Vector4> _getVector4 = GetVector4;
+
+            FieldInfo setVector4Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setVector4", BindingFlags.Static | BindingFlags.NonPublic);
+            setVector4Info?.SetValue(null, _setVector4);
+            
+            FieldInfo getVector4Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getVector4", BindingFlags.Static | BindingFlags.NonPublic);
+            getVector4Info?.SetValue(null, _getVector4);
+            
+            System.Action<string, Quaternion> _setQuaternion = SetQuaternion;
+            System.Func<VRCPlayerApi, string, Quaternion> _getQuaternion = GetQuaternion;
+
+            FieldInfo setQuaternionInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setQuaternion", BindingFlags.Static | BindingFlags.NonPublic);
+            setQuaternionInfo?.SetValue(null, _setQuaternion);
+            
+            FieldInfo getQuaternionInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getQuaternion", BindingFlags.Static | BindingFlags.NonPublic);
+            getQuaternionInfo?.SetValue(null, _getQuaternion);
+            
+            System.Action<string, UnityEngine.Color> _setColor = SetColor;
+            System.Func<VRCPlayerApi, string, UnityEngine.Color> _getColor = GetColor;
+
+            FieldInfo setColorInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setColor", BindingFlags.Static | BindingFlags.NonPublic);
+            setColorInfo?.SetValue(null, _setColor);
+            
+            FieldInfo getColorInfo = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getColor", BindingFlags.Static | BindingFlags.NonPublic);
+            getColorInfo?.SetValue(null, _getColor);
+            
+            System.Action<string, UnityEngine.Color32> _setColor32 = SetColor32;
+            System.Func<VRCPlayerApi, string, UnityEngine.Color32> _getColor32 = GetColor32;
+
+            FieldInfo setColor32Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_setColor32", BindingFlags.Static | BindingFlags.NonPublic);
+            setColor32Info?.SetValue(null, _setColor32);
+            
+            FieldInfo getColor32Info = typeof(VRC.SDK3.Persistence.PlayerData).GetField("_getColor32", BindingFlags.Static | BindingFlags.NonPublic);
+            getColor32Info?.SetValue(null, _getColor32);
+        }
+
+        private static bool FindStorage(VRCPlayerApi playerApi, out ClientSimPlayerDataStorage storage)
+        {
+            ClientSimPlayer player = playerApi.GetClientSimPlayer();
+            if (!player)
+            {
+                UnityEngine.Debug.LogError("Could not locate player with id " + playerApi.playerId + " for PlayerData storage.");
+                storage = null;
+                return false;
+            }
+
+            storage = player.PlayerDataObject;
+            if (!storage)
+            {
+                UnityEngine.Debug.LogError("Could not locate PlayerData storage for player " + playerApi.playerId);
+                return false;
+            }
+
+            return true;
+        }
+
+        public static IEnumerable<string> GetKeys(VRCPlayerApi playerApi)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return Enumerable.Empty<string>();
+            return storage.GetKeys();
+        }
+
+        public static bool HasKey(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return false;
+            return storage.HasKey(key);
+        }
+
+        public static Type GetType(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return null;
+            return storage.GetType(key);
+        }
+
+        public static void SetBool(string key, bool data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetBool(key, data);
+        }
+
+        public static bool GetBool(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetBool(key);
+        }
+
+        public static void SetByte(string key, byte data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetByte(key, data);
+        }
+
+        public static byte GetByte(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetByte(key);
+        }
+        
+        public static void SetSByte(string key, sbyte data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetSByte(key, data);
+        }
+        
+        public static sbyte GetSByte(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetSByte(key);
+        }
+        
+        public static void SetBytes(string key, byte[] data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetBytes(key, data);
+        }
+
+        public static byte[] GetBytes(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetBytes(key);
+        }
+
+        public static void SetString(string key, string data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetString(key, data);
+        }
+
+        public static string GetString(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetString(key);
+        }
+
+        public static void SetShort(string key, short data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetShort(key, data);
+        }
+
+        public static void SetUShort(string key, ushort data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetUShort(key, data);
+        }
+
+        public static short GetShort(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetShort(key);
+        }
+
+        public static ushort GetUShort(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetUShort(key);
+        }
+
+        public static void SetInt(string key, int data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetInt(key, data);
+        }
+
+        public static void SetUInt(string key, uint data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetUInt(key, data);
+        }
+
+        public static int GetInt(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetInt(key);
+        }
+
+        public static uint GetUInt(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetUInt(key);
+        }
+        
+        public static void SetLong(string key, long data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetLong(key, data);
+        }
+        
+        public static long GetLong(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetLong(key);
+        }
+        
+        public static void SetULong(string key, ulong data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetULong(key, data);
+        }
+
+        public static ulong GetULong(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetULong(key);
+        }
+        
+        public static void SetFloat(string key, float data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetFloat(key, data);
+        }
+
+        public static float GetFloat(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetFloat(key);
+        }
+        
+        public static void SetDouble(string key, double data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetDouble(key, data);
+        }
+        
+        public static double GetDouble(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetDouble(key);
+        }
+
+        public static void SetVector2(string key, Vector2 data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetVector2(key, data);
+        }
+
+        public static Vector2 GetVector2(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetVector2(key);
+        }
+
+        public static void SetVector3(string key, Vector3 data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetVector3(key, data);
+        }
+
+        public static Vector3 GetVector3(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetVector3(key);
+        }
+
+        public static void SetVector4(string key, Vector4 data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetVector4(key, data);
+        }
+
+        public static Vector4 GetVector4(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetVector4(key);
+        }
+
+        public static void SetQuaternion(string key, Quaternion data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetQuaternion(key, data);
+        }
+
+        public static Quaternion GetQuaternion(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetQuaternion(key);
+        }
+
+        public static void SetColor(string key, UnityEngine.Color data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetColor(key, data);
+        }
+
+        public static UnityEngine.Color GetColor(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetColor(key);
+        }
+
+        public static void SetColor32(string key, UnityEngine.Color32 data)
+        {
+            if (!FindStorage(Networking.LocalPlayer, out ClientSimPlayerDataStorage storage)) return;
+            storage.SetColor32(key, data);
+        }
+
+        public static UnityEngine.Color32 GetColor32(VRCPlayerApi playerApi, string key)
+        {
+            if (!FindStorage(playerApi, out ClientSimPlayerDataStorage storage)) return default;
+            return storage.GetColor32(key);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs.meta
new file mode 100644
index 0000000..05c2b3e
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerDataWrapper.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cf5156727fe54ec1b396e496f91f03d4
+timeCreated: 1708639223
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs
new file mode 100644
index 0000000..711f488
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using Cysharp.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using VRC.SDK3.ClientSim.Interfaces;
+using VRC.SDK3.Data;
+using VRC.SDKBase;
+using VRC.Udon;
+
+namespace VRC.SDK3.ClientSim.Persistence
+{
+    [AddComponentMenu("")] // hides component in Add Component menu
+    public class ClientSimPlayerObjectStorage : ClientSimBehaviour
+    {
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+        public static string PlayerObjectsFolder => Path.Combine("ClientSimStorage", "PlayerObjects");
+        internal static string ActiveSceneName;
+        internal static string PlayerDataFilePath(VRCPlayerApi player) 
+        {
+            string root = Path.GetDirectoryName(Application.dataPath);
+            string path = Path.Combine(root, PlayerObjectsFolder);
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+            return path + "/PlayerObject_" + $"{player.playerId}" + $"_{ActiveSceneName}" + ".json";
+        }
+
+        private VRCPlayerApi _player;
+        private IClientSimUdonEventSender _udonEventSender;
+        private IClientSimEventDispatcher _eventDispatcher;
+        
+        private Dictionary<int,IClientSimNetworkView> _persistentObjects = new Dictionary<int, IClientSimNetworkView>();
+        private DataDictionary _persistentObjectData = new DataDictionary();
+            
+        private bool _isInitialized = false;
+        private bool _HasJoined = false;
+        
+        private Coroutine _ContinuousUpdate;
+        
+        private const float _updateInterval = 1 / 4f;
+        
+        private bool hadUpdate = false;
+        
+        public void Init(VRCPlayerApi player, IClientSimUdonEventSender udonEventSender, IClientSimEventDispatcher eventDispatcher)
+        {
+            _player = player;
+            _udonEventSender = udonEventSender;
+            _eventDispatcher = eventDispatcher;
+            
+            ActiveSceneName = SceneManager.GetActiveScene().name;
+            
+            _eventDispatcher.Subscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+            UdonBehaviour.RequestSerializationHook += RequestSerializationHook;
+            _isInitialized = true;
+            
+            _ContinuousUpdate = StartCoroutine(UpdateContinuous());
+        }
+
+        private void OnDestroy()
+        {
+            if(_eventDispatcher != null)
+                _eventDispatcher.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+            
+            if(_ContinuousUpdate != null)
+                StopCoroutine(_ContinuousUpdate);
+        }
+
+        public IEnumerator UpdateContinuous()
+        {
+            while (true)
+            {
+                if (_HasJoined && _isInitialized)
+                {
+                    Encode();
+                }
+                
+                yield return new WaitForSeconds(_updateInterval);
+            }
+        }
+        
+        public void RequestSerializationHook(UdonBehaviour udonBehaviour)
+        {
+            ClientSimNetworkEventSending.Instance.QueueRequest(udonBehaviour, this);
+        }
+
+        private void OnPlayerJoined(ClientSimOnPlayerJoinedEvent payload)
+        {
+            if (payload.player.playerId == _player.playerId)
+            {
+                _HasJoined = true;
+                Decode();
+            }
+        }
+        
+        public void Encode(GameObject gameObject = null)
+        {
+            if (!_isInitialized || !_HasJoined) return;
+            
+            if(_persistentObjectData == null)
+                _persistentObjectData = new DataDictionary();
+
+            foreach (var keyValuePersistentObject in _persistentObjects)
+            {
+                DataToken key = keyValuePersistentObject.Key.ToString();
+                if (!_persistentObjectData.ContainsKey(key))
+                    _persistentObjectData.Add(key, new DataList());
+                _persistentObjectData[key] = keyValuePersistentObject.Value.Encode(gameObject);
+            }
+            
+            hadUpdate = true;
+        }
+
+        private async UniTask SaveToFile(string data)
+        {
+            await UniTask.SwitchToTaskPool();
+            try{
+                await File.WriteAllTextAsync(PlayerDataFilePath(_player), data);
+            }
+            catch (Exception e)
+            {
+                this.LogError($"Error saving PlayerObjects: {e.Message}");
+            }
+        }
+
+        private void Decode()
+        {
+            string path = PlayerDataFilePath(_player);
+
+            if (!File.Exists(path))
+            {
+                File.WriteAllText(path, "{}");
+            }
+
+            string json = File.ReadAllText(path);
+            if (!VRCJson.TryDeserializeFromJson(json, out DataToken token))
+            {
+                this.LogError($"Error initializing PlayerObjects: {token.Error}");
+                return;
+            }
+
+            _persistentObjectData = token.DataDictionary;
+            ClientSimPlayer player = _player.GetClientSimPlayer();
+            foreach (GameObject persistantObject in player.PlayerPersistenceObjects)
+            {
+                IClientSimNetworkId networkId = persistantObject.GetComponent<IClientSimNetworkId>();
+                if (networkId == null) continue;
+                int id = networkId.GetNetworkId();
+
+                IClientSimNetworkView serializer = persistantObject.GetComponent<IClientSimNetworkView>();
+
+                _persistentObjects.TryAdd(id, serializer);
+                if (_persistentObjectData.TryGetValue(id.ToString(), out var data))
+                {
+                    _persistentObjects[id].Decode(data.DataList);
+                }
+            }
+            
+            _eventDispatcher.SendEvent(new ClientSimOnPlayerObjectsDecodedEvent { player = _player });
+        }
+
+        public void LateUpdate()
+        {
+            if (hadUpdate)
+            {
+                hadUpdate = false;
+                _eventDispatcher.SendEvent(new ClientSimOnPlayerObjectUpdateEndedEvent());
+                
+                VRCJson.TrySerializeToJson(_persistentObjectData, JsonExportType.Beautify, out DataToken json);
+                SaveToFile(json.String).Forget();
+            }
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs.meta b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs.meta
new file mode 100644
index 0000000..6bbaee4
--- /dev/null
+++ b/Source/Runtime/Player/PlayerPersistence/ClientSimPlayerObjectStorage.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 06c904c1b8134763a58e319723ec67ad
+timeCreated: 1709650412
\ No newline at end of file
diff --git a/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Base_MAT.mat b/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Base_MAT.mat
index eeaadc6..824615a 100644
--- a/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Base_MAT.mat
+++ b/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Base_MAT.mat
@@ -2,20 +2,28 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Avatar_Utility_Base_MAT
   m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
-  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _ENABLE_GEOMETRIC_SPECULAR_AA
+  m_InvalidKeywords:
+  - _METALLICGLOSSMAP
+  - _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,21 +63,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _Bicubic: 0
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnableEmission: 1
+    - _EnableGeometricSpecularAA: 1
     - _GlossMapScale: 0.58
     - _Glossiness: 0.359
     - _GlossyReflections: 1
+    - _LightmapType: 0
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Shininess: 0.537
     - _SmoothnessTextureChannel: 0
+    - _SpecularAAScreenSpaceVariance: 0.1
+    - _SpecularAAThreshold: 0.2
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
@@ -77,3 +91,4 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Body_MAT.mat b/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Body_MAT.mat
index 92fddac..d0a9258 100644
--- a/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Body_MAT.mat
+++ b/Source/Runtime/Resources/ClientSim/Avatars/VRC_Utility_FullBody/Materials/Avatar_Utility_Body_MAT.mat
@@ -2,20 +2,28 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Avatar_Utility_Body_MAT
   m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
-  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _ENABLE_GEOMETRIC_SPECULAR_AA
+  m_InvalidKeywords:
+  - _METALLICGLOSSMAP
+  - _NORMALMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,21 +63,27 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
+    - _Bicubic: 0
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnableEmission: 1
+    - _EnableGeometricSpecularAA: 1
     - _GlossMapScale: 0.55
     - _Glossiness: 0.571
     - _GlossyReflections: 1
+    - _LightmapType: 0
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Shininess: 1
     - _SmoothnessTextureChannel: 0
+    - _SpecularAAScreenSpaceVariance: 0.1
+    - _SpecularAAThreshold: 0.2
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
@@ -77,3 +91,4 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab
new file mode 100644
index 0000000..722bc3f
--- /dev/null
+++ b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab
@@ -0,0 +1,59 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8965790269314133771
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8855558192208350178}
+  - component: {fileID: 6125864761777863447}
+  - component: {fileID: -1432711561881907052}
+  m_Layer: 0
+  m_Name: ClientSimPlayerData
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8855558192208350178
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8965790269314133771}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6125864761777863447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8965790269314133771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ef04bdeba52437cb909dc841044fd57, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &-1432711561881907052
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8965790269314133771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06c904c1b8134763a58e319723ec67ad, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/Source/README.md.meta b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab.meta
similarity index 62%
rename from Source/README.md.meta
rename to Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab.meta
index 7acd0c3..87fea19 100644
--- a/Source/README.md.meta
+++ b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerData.prefab.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 3a343146949d3e342ba5abcfe6c4c808
-TextScriptImporter:
+guid: adab318f0eade724288895ff018778fb
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerLocal.prefab b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerLocal.prefab
index 3a6d76a..3ad5976 100644
--- a/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerLocal.prefab
+++ b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerLocal.prefab
@@ -24,14 +24,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1520368773658574567}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8136021783709213184}
   - {fileID: 4166223426551178936}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8735158490342660880
 MonoBehaviour:
@@ -74,6 +75,9 @@ MonoBehaviour:
     avatarAudioGain: 0
     avatarAudioCustomCurve: 0
     avatarAudioForceSpatial: 0
+  PlayerPersistenceObjects: []
+  PlayerDataPrefab: {fileID: 6125864761777863447, guid: adab318f0eade724288895ff018778fb,
+    type: 3}
 --- !u!1 &1747001265075626404
 GameObject:
   m_ObjectHideFlags: 0
@@ -98,12 +102,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1747001265075626404}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: 0.000000014901163, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1068071324215617096}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &2672524086710227960
 Rigidbody:
@@ -112,10 +117,21 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1747001265075626404}
-  serializedVersion: 2
+  serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 1
   m_Interpolate: 0
@@ -145,13 +161,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6183443233582450204}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6416732588723397274}
   m_Father: {fileID: 4166223426551178936}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7332653421116794219
 MonoBehaviour:
@@ -196,16 +213,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8104978433573980496}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3847117398369604460}
   - {fileID: 4543718553141955561}
   - {fileID: 1068071324215617096}
   - {fileID: 5997934662479437569}
   m_Father: {fileID: 9201486100010084664}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2879604618624032515
 MonoBehaviour:
@@ -252,10 +270,21 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8104978433573980496}
-  serializedVersion: 2
+  serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 1
   m_Interpolate: 0
@@ -269,9 +298,17 @@ CharacterController:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8104978433573980496}
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
   m_IsTrigger: 0
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
   m_Height: 1.6
   m_Radius: 0.2
   m_SlopeLimit: 50
@@ -303,13 +340,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8327901833412234180}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1398508587545401248}
   m_Father: {fileID: 4166223426551178936}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1428030017342660723
 MonoBehaviour:
@@ -350,12 +388,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8482763490750987116}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: 0.000000014901163, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4543718553141955561}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &2617244907005037469
 Rigidbody:
@@ -364,10 +403,21 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8482763490750987116}
-  serializedVersion: 2
+  serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 1
   m_Interpolate: 0
@@ -378,6 +428,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 4166223426551178936}
     m_Modifications:
     - target: {fileID: 6277239501755619977, guid: 6be65459cc2282a4094483092bc0dfe2,
@@ -446,6 +497,9 @@ PrefabInstance:
       value: MainCamera
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6be65459cc2282a4094483092bc0dfe2, type: 3}
 --- !u!4 &5997934662479437569 stripped
 Transform:
@@ -470,6 +524,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 9201486100010084664}
     m_Modifications:
     - target: {fileID: 5985191620957555646, guid: 1152d1ec7ec6c924e818d98cc0d0c418,
@@ -538,13 +593,10 @@ PrefabInstance:
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1152d1ec7ec6c924e818d98cc0d0c418, type: 3}
---- !u!4 &8136021783709213184 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5985191620957555646, guid: 1152d1ec7ec6c924e818d98cc0d0c418,
-    type: 3}
-  m_PrefabInstance: {fileID: 2587133980147067326}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7639268120162917090 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5324232520253109084, guid: 1152d1ec7ec6c924e818d98cc0d0c418,
@@ -557,11 +609,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d04f5e2ca86a6fe48854dbfe994387e2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &8136021783709213184 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5985191620957555646, guid: 1152d1ec7ec6c924e818d98cc0d0c418,
+    type: 3}
+  m_PrefabInstance: {fileID: 2587133980147067326}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5614778402216200928
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 4166223426551178936}
     m_Modifications:
     - target: {fileID: 1598447951629261349, guid: 5af4354a65e661241b77548083612a12,
@@ -625,6 +684,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5af4354a65e661241b77548083612a12, type: 3}
 --- !u!4 &3847117398369604460 stripped
 Transform:
diff --git a/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerRemote.prefab b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerRemote.prefab
index cd40b52..93e3429 100644
--- a/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerRemote.prefab
+++ b/Source/Runtime/Resources/ClientSim/Prefabs/ClientSimPlayerRemote.prefab
@@ -26,13 +26,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1537256436979219201}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7897631054902746547}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7511706412250944283
 MonoBehaviour:
@@ -47,12 +48,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   playerController: {fileID: 0}
-  stationHandler: {fileID: 0}
+  stationManager: {fileID: 0}
   playerRaycaster: {fileID: 0}
   playerTrackingData: {fileID: 0}
   playerAvatar: {fileID: 2635322609852478987}
   reticle: {fileID: 0}
-  vrRaycast: {fileID: 0}
   isInstanceOwner: 0
   locomotionData:
     walkSpeed: 2
@@ -76,6 +76,9 @@ MonoBehaviour:
     avatarAudioGain: 0
     avatarAudioCustomCurve: 0
     avatarAudioForceSpatial: 0
+  PlayerPersistenceObjects: []
+  PlayerDataPrefab: {fileID: 6125864761777863447, guid: adab318f0eade724288895ff018778fb,
+    type: 3}
 --- !u!54 &2985790521629584760
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -83,10 +86,21 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1537256436979219201}
-  serializedVersion: 2
+  serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 1
   m_Interpolate: 0
@@ -100,9 +114,17 @@ SphereCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1537256436979219201}
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
   m_IsTrigger: 0
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &1518278535141655615
@@ -110,6 +132,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 7351285468603948201}
     m_Modifications:
     - target: {fileID: 51700705522361369, guid: 5af4354a65e661241b77548083612a12,
@@ -898,13 +921,10 @@ PrefabInstance:
       value: 9
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5af4354a65e661241b77548083612a12, type: 3}
---- !u!4 &7897631054902746547 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8685200476950124940, guid: 5af4354a65e661241b77548083612a12,
-    type: 3}
-  m_PrefabInstance: {fileID: 1518278535141655615}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &2635322609852478987 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3567002345054663220, guid: 5af4354a65e661241b77548083612a12,
@@ -917,3 +937,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac1020b347eeb4e45afabd4d605aa3ae, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &7897631054902746547 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8685200476950124940, guid: 5af4354a65e661241b77548083612a12,
+    type: 3}
+  m_PrefabInstance: {fileID: 1518278535141655615}
+  m_PrefabAsset: {fileID: 0}
diff --git a/Source/Runtime/Stubs/ClientSimAVProVideoStub.cs b/Source/Runtime/Stubs/ClientSimAVProVideoStub.cs
index f8609a8..55424b5 100644
--- a/Source/Runtime/Stubs/ClientSimAVProVideoStub.cs
+++ b/Source/Runtime/Stubs/ClientSimAVProVideoStub.cs
@@ -18,11 +18,17 @@ public static IAVProVideoPlayerInternal InitializePlayer(VRCAVProVideoPlayer pla
         public bool IsReady { get; }
         public bool UseLowLatency { get; }
 
+        public int VideoWidth { get; private set; }
+
+        public int VideoHeight { get; private set; }
+
         public ClientSimAVProVideoStub(VRCAVProVideoPlayer videoPlayer)
         {
             IsPlaying = false;
             IsReady = false;
             UseLowLatency = videoPlayer.UseLowLatency;
+            VideoWidth = videoPlayer.VideoWidth;
+            VideoHeight = videoPlayer.VideoHeight;
         }
         
         public float GetTime()
diff --git a/Source/Runtime/Stubs/UdonProductStub.cs b/Source/Runtime/Stubs/UdonProductStub.cs
index 245522c..5a2fd57 100644
--- a/Source/Runtime/Stubs/UdonProductStub.cs
+++ b/Source/Runtime/Stubs/UdonProductStub.cs
@@ -35,10 +35,19 @@ public Task<bool> Delete()
             throw new NotImplementedException();
         }
 
-        public Task<IProduct[]> Purchase(string variantID = null, int totalPrice = 0, int quantity = -1, Action onPurchaseSuccess = null,
-            Action<string> onPurchaseError = null, bool localInstance = false)
+        public Task<IProduct[]> Purchase(
+            string variantID = null, 
+            int totalPrice = 0, 
+            int quantity = -1,
+            Action onPurchaseSuccess = null,
+            Action<string> onPurchaseError = null,
+            string analyticsLocationType = null,
+            string analyticsStoreId = null,
+            string analyticsWorldId = null,
+            string analyticsGroupId = null,
+            string analyticsCreatorId = null)
         {
             throw new NotImplementedException();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Runtime/System/ClientSimInteractiveLayerProvider.cs b/Source/Runtime/System/ClientSimInteractiveLayerProvider.cs
index 4594530..dc6fdf3 100644
--- a/Source/Runtime/System/ClientSimInteractiveLayerProvider.cs
+++ b/Source/Runtime/System/ClientSimInteractiveLayerProvider.cs
@@ -5,7 +5,8 @@
 namespace VRC.SDK3.ClientSim
 {
     /// <summary>
-    /// System that provides what layers the player can interact with at a given time. Interactive layers will change depending on if the Menu is open or not.
+    /// System that provides what layers the player can interact with at a given time.
+    /// Interactive layers will change depending on if the Menu is open or not.
     /// </summary>
     /// <remarks>
     /// Listens to Events:
@@ -14,12 +15,12 @@ namespace VRC.SDK3.ClientSim
     public class ClientSimInteractiveLayerProvider : IClientSimInteractiveLayerProvider, IDisposable
     {
         private const int UI_LAYER = 5;
-        private const int UI_MENU_LAYER = 12;
-        private const int INTERNAL_UI_LAYER = 19;
         private const int PLAYER_LOCAL_LAYER = 10;
+        private const int UI_MENU_LAYER = 12;
         private const int MIRROR_REFLECTION_LAYER = 18;
+        private const int INTERNAL_UI_LAYER = 19;
         private const int FIRST_USER_LAYER = 22;
-        
+
         private readonly int _interactiveLayersDefault;
         private readonly int _interactiveLayersUI;
 
diff --git a/Source/Runtime/System/ClientSimMain.cs b/Source/Runtime/System/ClientSimMain.cs
index 4c1fcb1..31b4258 100644
--- a/Source/Runtime/System/ClientSimMain.cs
+++ b/Source/Runtime/System/ClientSimMain.cs
@@ -1,7 +1,10 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using Cysharp.Threading.Tasks;
+using UnityEditor;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using VRC.Core;
 using VRC.Economy;
 using VRC.SDK3.Network;
@@ -10,6 +13,17 @@
 using VRC.SDKBase;
 using VRC.SDKBase.Platform;
 using VRC.Udon;
+using VRC.Economy;
+using VRC.SDKBase.Network;
+using VRC.Economy;
+using VRCNetworkBehaviour = VRC.SDK3.Network.VRCNetworkBehaviour;
+using System;
+using VRC.SDK3.Components;
+using VRCStation = VRC.SDKBase.VRCStation;
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+using VRC.SDK3.ClientSim.Persistence;
+using System.Linq;
+#endif
 
 namespace VRC.SDK3.ClientSim
 {
@@ -62,6 +76,7 @@ public class ClientSimMain : ClientSimBehaviour
         private ClientSimBlacklistManager _blacklistManager;
         private ClientSimInteractiveLayerProvider _interactiveLayerProvider;
         private IClientSimSessionState _sessionState;
+        private IClientSimUdonEventSender _udonEventSender;
 
         // public so that height can be adjusted via the settings window
         public ClientSimPlayerHeightManager HeightManager { get; private set; }
@@ -79,7 +94,7 @@ public static void CreateInstance(
             {
                 throw new ClientSimException("Cannot create an instance of ClientSim while one already exists.");
             }
-
+            
             // Configure Delegates for Allowlisted URL Validation
             VRCUrl.DomainExplicitAllowlistDelegate = () => UrlAllowlistConfig.DomainExplicitAllowlist;
             VRCUrl.DomainWildcardAllowlistDelegate = () => UrlAllowlistConfig.DomainWildcardAllowlist;
@@ -157,8 +172,6 @@ public static void RemoveInstance()
                 DestroyImmediate(_instance.gameObject);
             }
         }
-        
-        
 
         protected override void Awake()
         {
@@ -209,6 +222,8 @@ private void Initialize(
                 return;
             }
             
+            ClientSimNetworkingUtilities.ConfigureNetworkOnScene(VRC_SceneDescriptor.Instance);
+
             _settings = settings;
 
             // Event Dispatcher is provided during tests to listen and send events before everything has been initialized.
@@ -223,8 +238,8 @@ private void Initialize(
             inputManager.Initialize(_settings);
             IClientSimInput input = inputManager.GetInput();
             
-            ClientSimUdonManagerEventSender udonEventSender = new(UdonManager.Instance);
-            HeightManager = new ClientSimPlayerHeightManager(_eventDispatcher, udonEventSender);
+            _udonEventSender = new ClientSimUdonManagerEventSender(UdonManager.Instance);
+            HeightManager = new ClientSimPlayerHeightManager(_eventDispatcher, _udonEventSender);
 
             udonInput.Initialize(_eventDispatcher, input);
             menu.Initialize(_eventDispatcher, input, _settings, _sessionState, HeightManager);
@@ -235,8 +250,8 @@ private void Initialize(
             // ObjectManager must be initialized before UdonManager to ensure object ownership for leaving players
             // is handled first.
             syncedObjectManager.Initialize(_eventDispatcher, _sceneManager, _playerManager);
-            _udonManager = new ClientSimUdonManager(_eventDispatcher, syncedObjectManager, udonEventSender);
-            playerSpawner.Initialize(_sceneManager, _playerManager, _blacklistManager, null);
+            _udonManager = new ClientSimUdonManager(_eventDispatcher, syncedObjectManager, _udonEventSender);
+            playerSpawner.Initialize(_sceneManager, _playerManager, _blacklistManager, _eventDispatcher, null);
             
             // Option to allow for spawning remote players first to prevent the local player from being master.
             // TODO replace this with networking test system to save previous player count in the instance.
@@ -258,7 +273,12 @@ private void Initialize(
                 _interactiveLayerProvider,
                 baseInput,
                 _sceneManager,
-                _proxyObject, 
+                _proxyObject,
+                _udonEventSender,
+                _blacklistManager,
+                _udonManager,
+                syncedObjectManager,
+                _playerManager,
                 HeightManager);
 
             Camera playerCamera = _player.GetCameraProvider().GetCamera();
@@ -419,6 +439,77 @@ private string GetUniqueStringForObject(GameObject obj)
             return obj.GetInstanceID().ToString();
         }
 
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+        private GameObject[] GetPlayerPersistence(VRCPlayerApi playerApi)
+        {
+            ClientSimPlayer player = playerApi.GetClientSimPlayer();
+            if (player == null || player.PlayerPersistenceRootObjects == null)
+                return System.Array.Empty<GameObject>();
+
+            return player.PlayerPersistenceRootObjects;
+        }
+        
+        private Component FindComponentInPlayerObjects(VRCPlayerApi target, Component referenceComponent)
+        {
+            if (referenceComponent == null)
+                throw new ArgumentNullException(nameof(referenceComponent));
+            
+            VRCPlayerObject sourceObject = referenceComponent.GetComponentInParent<VRC.SDK3.Components.VRCPlayerObject>(true);
+            if (sourceObject == null)
+                throw new ArgumentException($"{nameof(referenceComponent)} must be on a player object.");
+            
+            GameObject networkGameObject = ((Component)referenceComponent.gameObject.GetComponentInParent<INetworkID>(true)).gameObject;
+            VRCSceneDescriptor sdk3Descriptor = (VRCSceneDescriptor)VRC_SceneDescriptor.Instance;
+            int idx = sdk3Descriptor.NetworkIDCollection.FindIndex((x) => x.gameObject == networkGameObject);
+            if (idx < 0)
+                throw new ArgumentException($"{nameof(referenceComponent)} must be on a player object in the NetworkIDCollection.");
+            
+            VRC.SDKBase.Network.NetworkIDPair networkIdPair = sdk3Descriptor.NetworkIDCollection[idx];
+            // See ClientSimPlayer.SetupPlayerPersistence for how the ID is calculated
+            int desiredID = ClientSimNetworkingUtilities.FirstPlayerPersistenceID
+                            + networkIdPair.ID;
+
+            GameObject[] objs = GetPlayerPersistence(target);
+            if (objs == null)
+            {
+                Debug.LogError("Player persistence is missing for " + target.displayName);
+                return null;
+            }
+
+            var possibleMatches = VRC.Tools.FindComponentInPossibleClones(sourceObject.gameObject, referenceComponent, objs);
+            
+            Debug.Log($"Found {possibleMatches.Count()} possible matches for {referenceComponent.name} in player objects for {target.displayName}");;
+
+            foreach (Component possibleMatch in possibleMatches)
+            {
+                if (!possibleMatch) continue;
+                ClientSimNetworkIdHolder networkIdHolder = possibleMatch.GetComponentInParent<ClientSimNetworkIdHolder>(true);
+                if (!networkIdHolder)
+                    continue;
+                
+                int thisID = networkIdHolder.GetNetworkView()?.GetNetworkId() ?? 0;
+                if (thisID <= 0)
+                {
+                    Debug.LogError($"Network ID is invalid for {possibleMatch.name}");
+                    continue;
+                }
+                
+                int matchID = ClientSimNetworkingUtilities.FlattenPlayerViewId(thisID);
+                if (matchID == desiredID) return possibleMatch;
+                Debug.LogError($"Network ID {matchID} for {possibleMatch.name} does not match desired ID {desiredID}");
+            }
+
+            Debug.LogError($"Failed to find component {referenceComponent.GetType().Name} in player objects for {target.displayName}");
+            
+            return null;
+        }
+        
+        public void EnablePlayerObjects()
+        {
+            _player.EnablePlayerObjects();
+        }
+#endif
+
         private static void CallNetworkConfigure(VRCNetworkBehaviour behaviour)
         {
             behaviour.NetworkConfigure();
@@ -436,13 +527,21 @@ private void SetupSDKLinks()
             Networking._GetOwner += _playerManager.GetOwner;
             Networking._IsOwner += _playerManager.IsOwner;
             Networking._SetOwner += ClientSimPlayerManager.SetOwner;
+            Networking._GetMaster += _playerManager.GetMaster;
+            Networking._GetInstanceOwner += _playerManager.GetInstanceOwner;
             
             Networking._IsInstanceOwner += _playerManager.IsInstanceOwner;
             Networking._IsObjectReady += IsObjectReady;
             Networking._IsNetworkSettled += IsNetworkReady;
             
             Networking._GetUniqueName += GetUniqueStringForObject;
-
+            
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+            ClientSimPlayerDataWrapper.ConfigureSDK();
+            Networking._GetPlayerPersistence += GetPlayerPersistence;
+            Networking._FindComponentInPlayerObjects += FindComponentInPlayerObjects;
+#endif
+            
             VRCNetworkBehaviour.OnNetworkBehaviourAwake += CallNetworkConfigure;
             
             VRCStation.Initialize += ClientSimStationHelper.InitializeStations;
@@ -476,6 +575,7 @@ private void SetupSDKLinks()
             VRCPlayerApi._GetPlayerId += _playerManager.GetPlayerID;
             VRCPlayerApi._GetPlayerById += _playerManager.GetPlayerByID;
             VRCPlayerApi._isMasterDelegate += _playerManager.IsMaster;
+            VRCPlayerApi._isSuspendedDelegate += _playerManager.IsSuspended;
             VRCPlayerApi._TakeOwnership += ClientSimPlayerManager.SetOwner;
             VRCPlayerApi._IsOwner += _playerManager.IsOwner;
             VRCPlayerApi._isInstanceOwnerDelegate += _playerManager.IsInstanceOwner;
@@ -545,11 +645,17 @@ private void SetupSDKLinks()
             VRCPlayerApi._SetAvatarAudioForceSpatial += ClientSimPlayerManager.SetAvatarAudioForceSpatial;
             VRCPlayerApi._SetAvatarAudioCustomCurve += ClientSimPlayerManager.SetAvatarAudioCustomCurve;
             
-            VRCPlayerApi._SetVoiceLowpass += ClientSimPlayerManager.SetVoiceLowpass;
-            VRCPlayerApi._SetVoiceVolumetricRadius += ClientSimPlayerManager.SetVoiceVolumetricRadius;
-            VRCPlayerApi._SetVoiceDistanceFar += ClientSimPlayerManager.SetVoiceDistanceFar;
-            VRCPlayerApi._SetVoiceDistanceNear += ClientSimPlayerManager.SetVoiceDistanceNear;
             VRCPlayerApi._SetVoiceGain += ClientSimPlayerManager.SetVoiceGain;
+            VRCPlayerApi._SetVoiceDistanceNear += ClientSimPlayerManager.SetVoiceDistanceNear;
+            VRCPlayerApi._SetVoiceDistanceFar += ClientSimPlayerManager.SetVoiceDistanceFar;
+            VRCPlayerApi._SetVoiceVolumetricRadius += ClientSimPlayerManager.SetVoiceVolumetricRadius;
+            VRCPlayerApi._SetVoiceLowpass += ClientSimPlayerManager.SetVoiceLowpass;
+
+            VRCPlayerApi._GetVoiceGain += ClientSimPlayerManager.GetVoiceGain;
+            VRCPlayerApi._GetVoiceDistanceNear += ClientSimPlayerManager.GetVoiceDistanceNear;
+            VRCPlayerApi._GetVoiceDistanceFar += ClientSimPlayerManager.GetVoiceDistanceFar;
+            VRCPlayerApi._GetVoiceVolumetricRadius += ClientSimPlayerManager.GetVoiceVolumetricRadius;
+            VRCPlayerApi._GetVoiceLowpass += ClientSimPlayerManager.GetVoiceLowpass;
 
             VRCPlayerApi._GetCurrentLanguage += ClientSimPlayerManager.GetCurrentLanguage;
             VRCPlayerApi._GetAvailableLanguages += ClientSimPlayerManager.GetAvailableLanguages;
@@ -568,6 +674,7 @@ private void SetupSDKLinks()
             Store._doesAnyPlayerOwnProduct += ClientSimStoreManager.DoesAnyPlayerOwnProduct;
             Store._getPlayersWhoOwnProduct += ClientSimStoreManager.GetPlayersWhoOwnProduct;
             Store._listProductOwners += ClientSimStoreManager.ListProductOwners;
+            
         }
 
         private void RemoveSDKLinks()
@@ -583,9 +690,14 @@ private void RemoveSDKLinks()
             Networking._IsInstanceOwner -= _playerManager.IsInstanceOwner;
             Networking._IsObjectReady -= IsObjectReady;
             Networking._IsNetworkSettled -= IsNetworkReady;
-            
+
             Networking._GetUniqueName -= GetUniqueStringForObject;
 
+#if VRC_ENABLE_PLAYER_PERSISTENCE
+            Networking._GetPlayerPersistence -= GetPlayerPersistence;
+            Networking._FindComponentInPlayerObjects -= FindComponentInPlayerObjects;
+#endif
+            
             VRCNetworkBehaviour.OnNetworkBehaviourAwake -= CallNetworkConfigure;
 
             VRCStation.Initialize -= ClientSimStationHelper.InitializeStations;
@@ -723,6 +835,36 @@ internal ClientSimMenu GetMenu()
             return menu;
         }
 
+        internal IClientSimEventDispatcher GetEventDispatcher()
+        {
+            return _eventDispatcher;
+        }
+        
+        internal IClientSimUdonEventSender GetUdonEventSender()
+        {
+            return _udonEventSender;
+        }
+        
+        internal IClientSimBlacklistManager GetBlacklistManager()
+        {
+            return _blacklistManager;
+        }
+        
+        internal IClientSimUdonManager GetUdonManager()
+        {
+            return _udonManager;
+        }
+
+        internal IClientSimSyncedObjectManager GetSyncedObjectManager()
+        {
+            return syncedObjectManager;
+        }
+        
+        internal IClientSimPlayerManager GetPlayerManager()
+        {
+            return _playerManager;
+        }
+
         #endregion
     }
 }
diff --git a/Source/Runtime/System/ClientSimPlayerHeightManager.cs b/Source/Runtime/System/ClientSimPlayerHeightManager.cs
index 55a8220..d2a6bb7 100644
--- a/Source/Runtime/System/ClientSimPlayerHeightManager.cs
+++ b/Source/Runtime/System/ClientSimPlayerHeightManager.cs
@@ -15,6 +15,7 @@ public class ClientSimPlayerHeightManager : IClientSimPlayerHeightManager
 
         // Default avatar height is 1.9 units tall
         private float playerHeight = ClientSimSettings.Instance.playerStartHeight;
+        private float playerSpawnHeight = ClientSimSettings.Instance.playerStartHeight;
         private bool manualScalingAllowed = true;
         private IClientSimEventDispatcher eventDispatcher;
         private IClientSimUdonEventSender udonEventSender;
@@ -34,7 +35,7 @@ public ClientSimPlayerHeightManager(IClientSimEventDispatcher eventDispatcher, I
         
         public void Dispose()
         {
-            eventDispatcher.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
+            eventDispatcher?.Unsubscribe<ClientSimOnPlayerJoinedEvent>(OnPlayerJoined);
 
             eventDispatcher = null;
             udonEventSender = null;
@@ -84,7 +85,7 @@ public void SetAvatarEyeHeightMaximumByMeters(float value)
         }
         public float GetAvatarEyeHeightAsMeters() => playerHeight;
         public float GetAvatarEyeHeightAsMetersClamped() => Mathf.Clamp(playerHeight, userEyeHeightMin, userEyeHeightMax);
-        public void SetAvatarEyeHeightByMultiplier(float multiplier) => SetAvatarEyeHeightByMeters(playerHeight * multiplier);
+        public void SetAvatarEyeHeightByMultiplier(float multiplier) => SetAvatarEyeHeightByMeters(playerSpawnHeight * multiplier);
         public void SetAvatarEyeHeightByMeters(float newHeight, bool isManual = false)
         {
             float previousHeight = playerHeight;
diff --git a/Source/Runtime/System/ClientSimPlayerManager.cs b/Source/Runtime/System/ClientSimPlayerManager.cs
index 50a77b9..80c8228 100644
--- a/Source/Runtime/System/ClientSimPlayerManager.cs
+++ b/Source/Runtime/System/ClientSimPlayerManager.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using VRC.SDK3.Components;
 using VRC.SDKBase;
+using VRC.Udon;
 using Object = UnityEngine.Object;
 
 namespace VRC.SDK3.ClientSim
@@ -27,6 +29,8 @@ public class ClientSimPlayerManager : IClientSimPlayerManager, IDisposable
         private readonly List<VRCPlayerApi> _waitingPlayers = new List<VRCPlayerApi>();
         private bool _networkReady = false;
         
+        private VRCPlayerObject[] _playerObjectList;
+        
         private VRCPlayerApi _localPlayer;
 
         private IClientSimEventDispatcher _eventDispatcher;
@@ -68,7 +72,7 @@ private int GetNextPlayerId()
             return id;
         }
         
-        private void InitializePlayer(VRCPlayerApi player, int playerId)
+        private void InitializePlayer(ClientSimPlayer clientSimPlayer, VRCPlayerApi player, int playerId)
         {
             if (_players.ContainsKey(playerId))
             {
@@ -95,6 +99,17 @@ private void InitializePlayer(VRCPlayerApi player, int playerId)
                 });
             }
 
+#if VRC_ENABLE_PLAYER_PERSISTENCE 
+            clientSimPlayer.SetupPlayerPersistence(
+                ClientSimMain.GetInstance().GetEventDispatcher(),
+                ClientSimMain.GetInstance().GetUdonEventSender(), 
+                ClientSimMain.GetInstance().GetBlacklistManager(),
+                ClientSimMain.GetInstance().GetUdonManager(),
+                ClientSimMain.GetInstance().GetSyncedObjectManager(),
+                ClientSimMain.GetInstance().GetPlayerManager()
+            );
+#endif
+            
             if (_networkReady)
             {
                 DispatchPlayerJoinedEvent(player);
@@ -134,8 +149,8 @@ public VRCPlayerApi CreateNewPlayer(bool local, ClientSimPlayer player, string n
             };
 
             player.SetPlayer(playerApi);
-
-            InitializePlayer(playerApi, playerID);
+            
+            InitializePlayer(player, playerApi, playerID);
 
             if (local)
             {
@@ -146,7 +161,7 @@ public VRCPlayerApi CreateNewPlayer(bool local, ClientSimPlayer player, string n
 
             return playerApi;
         }
-        
+
         public void RemovePlayer(VRCPlayerApi player)
         {
             // Master is leaving, pick a new master.
@@ -171,7 +186,7 @@ public void RemovePlayer(VRCPlayerApi player)
             }
         
             _eventDispatcher?.SendEvent(new ClientSimOnPlayerLeftEvent { player = player });
-
+            
             _playerIDs.Remove(player);
             _players.Remove(player.playerId);
             player.RemoveFromList();
@@ -184,7 +199,7 @@ public void RemovePlayer(VRCPlayerApi player)
             
             Object.Destroy(player.gameObject);
         }
-
+        
         public int GetMasterID()
         {
             return _masterID;
@@ -195,6 +210,18 @@ public VRCPlayerApi GetMaster()
             return GetPlayerByID(_masterID);
         }
 
+        public VRCPlayerApi GetInstanceOwner()
+        {
+            foreach (var player in _players.Values)
+            {
+                if (player.GetClientSimPlayer().isInstanceOwner)
+                {
+                    return player;
+                }
+            }
+            return null;
+        }
+
         public VRCPlayerApi LocalPlayer()
         {
             return _localPlayer;
@@ -237,13 +264,18 @@ public bool IsLocalPlayerMaster()
             return _localPlayerID == _masterID;
         }
         
+        public bool IsSuspended(VRCPlayerApi player)
+        {
+            return player.GetClientSimPlayer().isSuspended;
+        }
+        
         public VRCPlayerApi GetOwner(GameObject obj)
         {
             // TODO consider SyncMode.None
             IClientSimSyncable sync = obj.GetComponent<IClientSimSyncable>();
 
             int playerID = sync != null ? sync.GetOwner() : _masterID;
-
+            
             if (!_players.TryGetValue(playerID, out VRCPlayerApi player))
             {
                 return null;
@@ -319,15 +351,14 @@ public static void TeleportToOrientationLerp(VRCPlayerApi player, Vector3 positi
 
         public static void TeleportToOrientation(VRCPlayerApi player, Vector3 position, Quaternion rotation, VRC_SceneDescriptor.SpawnOrientation orientation)
         {
-            TeleportToOrientationLerp(player, position, rotation, VRC_SceneDescriptor.SpawnOrientation.Default, false);
+            TeleportToOrientationLerp(player, position, rotation, orientation, false);
         }
 
         public static void TeleportTo(VRCPlayerApi player, Vector3 position, Quaternion rotation)
         {
-            TeleportToOrientationLerp(player, position, rotation, VRC_SceneDescriptor.SpawnOrientation.Default, false);
+            TeleportToOrientation(player, position, rotation, VRC_SceneDescriptor.SpawnOrientation.Default);
         }
         
-        
         public static void Respawn(VRCPlayerApi playerApi)
         {
             if (!playerApi.isLocal)
@@ -653,30 +684,35 @@ public static void SetAvatarAudioCustomCurve(VRCPlayerApi player, bool value)
             player.GetClientSimPlayer().audioData.SetAvatarAudioCustomCurve(value);
         }
 
-        public static void SetVoiceLowpass(VRCPlayerApi player, bool value)
-        {
-            player.GetClientSimPlayer().audioData.SetVoiceLowpass(value);
-        }
+        public static void SetVoiceGain(VRCPlayerApi player, float value) =>
+            player.GetClientSimPlayer().audioData.SetVoiceGain(value);
 
-        public static void SetVoiceVolumetricRadius(VRCPlayerApi player, float value)
-        {
-            player.GetClientSimPlayer().audioData.SetVoiceVolumetricRadius(value);
-        }
+        public static void SetVoiceDistanceNear(VRCPlayerApi player, float value) =>
+            player.GetClientSimPlayer().audioData.SetVoiceDistanceNear(value);
 
-        public static void SetVoiceDistanceFar(VRCPlayerApi player, float value)
-        {
+        public static void SetVoiceDistanceFar(VRCPlayerApi player, float value) =>
             player.GetClientSimPlayer().audioData.SetVoiceDistanceFar(value);
-        }
 
-        public static void SetVoiceDistanceNear(VRCPlayerApi player, float value)
-        {
-            player.GetClientSimPlayer().audioData.SetVoiceDistanceNear(value);
-        }
+        public static void SetVoiceVolumetricRadius(VRCPlayerApi player, float value) =>
+            player.GetClientSimPlayer().audioData.SetVoiceVolumetricRadius(value);
 
-        public static void SetVoiceGain(VRCPlayerApi player, float value)
-        {
-            player.GetClientSimPlayer().audioData.SetVoiceGain(value);
-        }
+        public static void SetVoiceLowpass(VRCPlayerApi player, bool value) =>
+            player.GetClientSimPlayer().audioData.SetVoiceLowpass(value);
+
+        public static float GetVoiceGain(VRCPlayerApi player) =>
+            player.GetClientSimPlayer().audioData.GetVoiceGain();
+
+        public static float GetVoiceDistanceNear(VRCPlayerApi player) => 
+            player.GetClientSimPlayer().audioData.GetVoiceDistanceNear();
+
+        public static float GetVoiceDistanceFar(VRCPlayerApi player) =>
+            player.GetClientSimPlayer().audioData.GetVoiceDistanceFar();
+
+        public static float GetVoiceVolumetricRadius(VRCPlayerApi player) =>
+            player.GetClientSimPlayer().audioData.GetVoiceVolumetricRadius();
+
+        public static bool GetVoiceLowpass(VRCPlayerApi player) =>
+            player.GetClientSimPlayer().audioData.GetVoiceLowpass();
         
         public static string GetCurrentLanguage()
         {
@@ -703,6 +739,7 @@ public static string[] GetAvailableLanguages()
         public static void SetAvatarEyeHeightByMultiplier(VRCPlayerApi _, float value) => _heightManager.SetAvatarEyeHeightByMultiplier(value);
         
         #endregion
+
     }
 }
  
\ No newline at end of file
diff --git a/Source/Runtime/System/ClientSimPlayerSpawner.cs b/Source/Runtime/System/ClientSimPlayerSpawner.cs
index cfc2ede..61361dc 100644
--- a/Source/Runtime/System/ClientSimPlayerSpawner.cs
+++ b/Source/Runtime/System/ClientSimPlayerSpawner.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using VRC.SDKBase;
 
 namespace VRC.SDK3.ClientSim
 {
@@ -17,17 +18,20 @@ public class ClientSimPlayerSpawner : ClientSimBehaviour
         private IClientSimSceneManager _sceneManager;
         private IClientSimPlayerManager _playerManager;
         private IClientSimBlacklistManager _blacklistManager;
+        private IClientSimEventDispatcher _eventDispatcher;
         private Transform _parent;
 
         public void Initialize(
             IClientSimSceneManager sceneManager,
             IClientSimPlayerManager playerManager,
             IClientSimBlacklistManager blacklistManager,
+            IClientSimEventDispatcher eventDispatcher,
             Transform parent)
         {
             _sceneManager = sceneManager;
             _playerManager = playerManager;
             _blacklistManager = blacklistManager;
+            _eventDispatcher = eventDispatcher;
             _parent = parent;
         }
 
@@ -64,13 +68,18 @@ public ClientSimPlayer SpawnPlayer(string playerName, bool isLocal)
             // PlayerManager will automatically handle sending player join event
             _playerManager.CreateNewPlayer(isLocal, player, playerName);
 
+            
             if (isLocal)
             {
                 // Disable player controller until ClientSim is initialized, which is when the player should be able to gain control.
                 playerInstance.SetActive(false);
             }
+
+            player.SetEventDispatcher(_eventDispatcher);
             
             return player;
         }
+        
+        
     }
 }
\ No newline at end of file
diff --git a/Source/Runtime/System/ClientSimStoreManager.cs.meta b/Source/Runtime/System/ClientSimStoreManager.cs.meta
new file mode 100644
index 0000000..759d506
--- /dev/null
+++ b/Source/Runtime/System/ClientSimStoreManager.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2d076b4f4b164393ac22400d6bd84118
+timeCreated: 1692235633
\ No newline at end of file
diff --git a/Source/Runtime/System/ClientSimSyncedObjectManager.cs b/Source/Runtime/System/ClientSimSyncedObjectManager.cs
index 775cb38..23b67ed 100644
--- a/Source/Runtime/System/ClientSimSyncedObjectManager.cs
+++ b/Source/Runtime/System/ClientSimSyncedObjectManager.cs
@@ -24,6 +24,10 @@ public class ClientSimSyncedObjectManager : ClientSimBehaviour, IClientSimSynced
         // Collection of all position synced objects initialized in the scene. 
         private readonly ClientSimObjectCollection<IClientSimPositionSyncable> _positionSyncedObjects =
             new ClientSimObjectCollection<IClientSimPositionSyncable>();
+        
+        // Collection of all synced playerObjects initialized in the scene.
+        private readonly ClientSimObjectCollection<IClientSimSyncable> _playerObjects =
+            new ClientSimObjectCollection<IClientSimSyncable>();
 
         // TODO add generic system for saving synced data and restoring it to simulate late joining into a world.
         // TODO add system to manage udon synced data
@@ -57,15 +61,17 @@ public void Dispose()
         public void InitializeObjectSync(VRCObjectSync sync)
         {
             // Only allow one sync helper per object.
-            var helper = sync.GetComponent<ClientSimObjectSyncHelper>();
-            if (helper)
+            if (sync.TryGetComponent(out ClientSimPositionSyncedHelperBase Synchelper))
             {
-                helper.LogWarning($"Destroying duplicate ObjectSync Helper. Object: {Tools.GetGameObjectPath(helper.gameObject)}");
-                DestroyImmediate(helper);
+                if(Synchelper is ClientSimObjectSyncHelper)
+                    ((ClientSimObjectSyncHelper)Synchelper).Initialize(sync,this);
+                // else other object sync helper types initialize object sync
+            }
+            else
+            {
+                ClientSimObjectSyncHelper helper = sync.gameObject.AddComponent<ClientSimObjectSyncHelper>();
+                helper.Initialize(sync,this);
             }
-
-            helper = sync.gameObject.AddComponent<ClientSimObjectSyncHelper>();
-            helper.Initialize(sync, this);
         }
         
         public void InitializeObjectPool(VRCObjectPool objectPool)
@@ -146,6 +152,8 @@ private void OnPlayerLeft(ClientSimOnPlayerLeftEvent leftEvent)
 
                 if (sync is Component syncComp)
                 {
+                    if(syncComp == null) continue;
+                    
                     GameObject syncObj = syncComp.gameObject;
                     if (Networking.GetOwner(syncObj)?.playerId == leftPlayerId)
                     {
@@ -176,6 +184,12 @@ public void AddSyncedObject(IClientSimSyncable sync)
                 _positionSyncedObjects.AddObject(posSync);
                 _positionSyncedObjects.ProcessAddedAndRemovedObjects();
             }
+            
+            if((sync as MonoBehaviour).GetComponentInParent<VRCPlayerObject>() != null)
+            {
+                _playerObjects.AddObject(sync);
+                _playerObjects.ProcessAddedAndRemovedObjects();
+            }
         }
 
         public void RemoveSyncedObject(IClientSimSyncable sync)
@@ -188,6 +202,12 @@ public void RemoveSyncedObject(IClientSimSyncable sync)
                 _positionSyncedObjects.RemoveObject(posSync);
                 _positionSyncedObjects.ProcessAddedAndRemovedObjects();
             }
+            
+            if((sync as MonoBehaviour).GetComponentInParent<VRCPlayerObject>() != null)
+            {
+                _playerObjects.RemoveObject(sync);
+                _playerObjects.ProcessAddedAndRemovedObjects();
+            }
         }
 
         #endregion
diff --git a/Source/Runtime/System/ClientSimUdonManager.cs b/Source/Runtime/System/ClientSimUdonManager.cs
index 2182d9b..21f12a3 100644
--- a/Source/Runtime/System/ClientSimUdonManager.cs
+++ b/Source/Runtime/System/ClientSimUdonManager.cs
@@ -3,6 +3,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using VRC.SDKBase;
 using VRC.Udon;
 using VRC.Udon.Common.Interfaces;
 
@@ -51,6 +52,7 @@ private void Subscribe()
             _eventDispatcher.Subscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
             _eventDispatcher.Subscribe<ClientSimOnPlayerRespawnEvent>(OnPlayerRespawn);
             _eventDispatcher.Subscribe<ClientSimScreenUpdateEvent>(OnScreenUpdate);
+            _eventDispatcher.Subscribe<ClientSimOnVRCPlusMassGift>(OnVRCPlusMassGift);
         }
         
         public void Dispose()
@@ -59,12 +61,36 @@ public void Dispose()
             _eventDispatcher.Unsubscribe<ClientSimOnPlayerLeftEvent>(OnPlayerLeft);
             _eventDispatcher.Unsubscribe<ClientSimOnPlayerRespawnEvent>(OnPlayerRespawn);
             _eventDispatcher.Unsubscribe<ClientSimScreenUpdateEvent>(OnScreenUpdate);
+            _eventDispatcher.Unsubscribe<ClientSimOnVRCPlusMassGift>(OnVRCPlusMassGift);
         }
 
         public void InitUdon(UdonBehaviour behaviour, IUdonProgram program)
         {
-            ClientSimUdonHelper helper = behaviour.gameObject.AddComponent<ClientSimUdonHelper>();
-            helper.Initialize(behaviour, this, _syncedObjectManager, _isReady);
+            ClientSimUdonHelper[] helpers = behaviour.gameObject.GetComponents<ClientSimUdonHelper>();
+
+            foreach (ClientSimUdonHelper helper in helpers)
+            {
+                if(helper.GetUdonBehaviour() == behaviour)
+                {
+                    return;
+                }
+            }
+            
+            if (helpers.Length == 0)
+            {
+                ClientSimUdonHelper helper = behaviour.gameObject.AddComponent<ClientSimUdonHelper>();
+                helper.Initialize(behaviour, this, _syncedObjectManager, _isReady);
+                return;
+            }
+            
+            foreach (ClientSimUdonHelper helper in helpers)
+            {
+                if(helper.GetUdonBehaviour() == null)
+                {
+                    helper.Initialize(behaviour, this, _syncedObjectManager, _isReady);
+                    return;
+                }
+            }
         }
 
         public IEnumerator OnClientSimReady()
@@ -103,6 +129,8 @@ public IEnumerator OnClientSimReady()
 
         private void OnPlayerJoined(ClientSimOnPlayerJoinedEvent joinEvent)
         {
+            _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONINPUTMETHODCHANGED, ("inputMethod", VRCInputMethod.Keyboard));
+            _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONLANGUAGECHANGED, ("language", ClientSimSettings.Instance.currentLanguage));
             _udonEventSender.RunEvent("_onPlayerJoined", ("player", joinEvent.player));
         }
 
@@ -121,6 +149,13 @@ private void OnScreenUpdate(ClientSimScreenUpdateEvent screenUpdateEvent)
             _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONSCREENUPDATE, ("data", screenUpdateEvent.data));
         }
 
+        private void OnVRCPlusMassGift(ClientSimOnVRCPlusMassGift giftEvent)
+        {
+            _udonEventSender.RunEvent(UdonManager.UDON_EVENT_ONVRCPLUSMASSGIFT, 
+                ("gifter", giftEvent.gifter),
+                ("numGifts", giftEvent.numGifts));
+        }
+
         #endregion
 
         #region IClientSimUdonManager
diff --git a/Source/Runtime/System/Interfaces/IClientSimPlayerManager.cs b/Source/Runtime/System/Interfaces/IClientSimPlayerManager.cs
index 2b99f7e..2aeaa19 100644
--- a/Source/Runtime/System/Interfaces/IClientSimPlayerManager.cs
+++ b/Source/Runtime/System/Interfaces/IClientSimPlayerManager.cs
@@ -1,5 +1,6 @@
 
 using UnityEngine;
+using VRC.SDK3.Components;
 using VRC.SDKBase;
 
 namespace VRC.SDK3.ClientSim
diff --git a/Source/Runtime/System/Interfaces/IClientSimSyncedObjectManager.cs b/Source/Runtime/System/Interfaces/IClientSimSyncedObjectManager.cs
index 37cf3ef..ff87b7f 100644
--- a/Source/Runtime/System/Interfaces/IClientSimSyncedObjectManager.cs
+++ b/Source/Runtime/System/Interfaces/IClientSimSyncedObjectManager.cs
@@ -1,8 +1,13 @@
-namespace VRC.SDK3.ClientSim
+using VRC.SDK3.Components;
+
+namespace VRC.SDK3.ClientSim
 {
     public interface IClientSimSyncedObjectManager
     {
         void AddSyncedObject(IClientSimSyncable sync);
         void RemoveSyncedObject(IClientSimSyncable sync);
+        
+        void InitializeObjectSync(VRCObjectSync sync);
+        void InitializeObjectPool(VRCObjectPool objectPool);
     }
 }
\ No newline at end of file
diff --git a/Source/Runtime/VRC.ClientSim.asmdef b/Source/Runtime/VRC.ClientSim.asmdef
index 85ef8a5..9de5c7d 100644
--- a/Source/Runtime/VRC.ClientSim.asmdef
+++ b/Source/Runtime/VRC.ClientSim.asmdef
@@ -7,7 +7,9 @@
         "VRC.Udon",
         "VRC.SDKBase",
         "VRC.ClientSim.SelectionHighlight",
-        "UniTask"
+        "UniTask",
+        "UdonSharp.Runtime",
+        "VRC.Udon.Editor"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Source/package.json b/Source/package.json
deleted file mode 100644
index 9a426fc..0000000
--- a/Source/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"name" : "com.vrchat.clientsim",
-	"displayName" : "VRChat Client Simulator",
-	"version" : "1.2.7",
-	"unity" : "2019.4",
-	"description" : "VRChat Client Simulator for testing SDK3 worlds in Unity.",
-	"author" : {
-		"name" : "VRChat",
-		"email" : "developer@vrchat.com",
-		"url" : "https://github.com/vrchat-community/ClientSim"
-	},
-	"dependencies" : {
-		"com.unity.xr.oculus.standalone" : "2.38.4",
-		"com.unity.inputsystem" : "1.2.0"
-	},
-	"vpmDependencies" : {
-		"com.vrchat.worlds" : "^3.2.2"
-	},
-	"samples" : [
-		{
-			"displayName" : "ClientSimWorldTestExample",
-			"description" : "An example of a world test using the Test Framework included in ClientSim. Automate interactions in your world and verify the results. Currently requires knowledge of C# and Unity Testing.",
-			"path" : "Samples~/ClientSimWorldTestExample"
-		},
-		{
-			"displayName" : "ClientSimSelfTests",
-			"description" : "Tests to ensure ClientSim works as expected. Includes: Respawn test.",
-			"path" : "Samples~/ClientSimSelfTests"
-		}
-	],
-	"legacyFolders" : {
-		"Assets\\CyanEmu" : "91b9a83a129504741a363d9a324de958"
-	}
-}
diff --git a/Source/package.json.meta b/Source/package.json.meta
deleted file mode 100644
index 04982da..0000000
--- a/Source/package.json.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fc00b5a764299cd439112b7e58412e7b
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: