diff --git a/studio/src/interaction/gizmos/mod.rs b/studio/src/interaction/gizmos/mod.rs
index b3eb1ea..53e9b14 100644
--- a/studio/src/interaction/gizmos/mod.rs
+++ b/studio/src/interaction/gizmos/mod.rs
@@ -143,10 +143,10 @@ fn spawn_gizmo(
 
 fn sync_gizmo_transform(
     mut cmd: Commands,
-    mut q_gizmo: Query<(&mut Transform, &TransformGizmo)>,
+    mut q_gizmo: Query<(Entity, &mut Transform, &TransformGizmo)>,
     q_targets: Query<&GlobalTransform>,
 ) {
-    for (mut transform, gizmo) in q_gizmo.iter_mut() {
+    for (ent, mut transform, gizmo) in q_gizmo.iter_mut() {
         if let Ok(target) = q_targets.get(gizmo.target) {
             match gizmo.transform_space {
                 super::TransformSpace::Local => {
@@ -159,7 +159,7 @@ fn sync_gizmo_transform(
                 }
             }
         } else {
-            cmd.entity(gizmo.target).despawn_recursive();
+            cmd.entity(ent).despawn_recursive();
         }
     }
 }
diff --git a/studio/src/lib.rs b/studio/src/lib.rs
index 84702a6..b9b3517 100644
--- a/studio/src/lib.rs
+++ b/studio/src/lib.rs
@@ -22,6 +22,7 @@ mod skybox;
 mod ui;
 mod viewport;
 mod world_grid;
+mod persistance;
 
 use crate::{
     camera_controller::CameraControllerPlugin,
diff --git a/studio/src/persistance/mod.rs b/studio/src/persistance/mod.rs
new file mode 100644
index 0000000..e69de29