diff --git a/src/components/spawn-controller.js b/src/components/spawn-controller.js
new file mode 100644
index 0000000000000000000000000000000000000000..4513c54ff953626aa08a7dc8fe0b5dcd64de1753
--- /dev/null
+++ b/src/components/spawn-controller.js
@@ -0,0 +1,29 @@
+AFRAME.registerComponent("spawn-controller", {
+  schema: {
+    radius: { type: "number", default: 1 }
+  },
+
+  init() {
+    const el = this.el;
+    const center = el.getAttribute("position");
+
+    const angleRad = Math.random() * 2 * Math.PI;
+    const circlePoint = this.getPointOnCircle(this.data.radius, angleRad);
+    const worldPoint = {
+      x: circlePoint.x + center.x,
+      y: center.y,
+      z: circlePoint.z + center.z
+    };
+    el.setAttribute("position", worldPoint);
+
+    const angleDeg = angleRad * THREE.Math.RAD2DEG;
+    const angleToCenter = -1 * angleDeg + 90;
+    el.setAttribute("rotation", { x: 0, y: angleToCenter, z: 0 });
+  },
+
+  getPointOnCircle(radius, angleRad) {
+    const x = Math.cos(angleRad) * radius;
+    const z = Math.sin(angleRad) * radius;
+    return { x: x, z: z };
+  }
+});
diff --git a/src/index.js b/src/index.js
index 918898be4a7338e270c7640d1d4d7eb7dbac4f53..0d4e04c91a232b5122efe6744cd080a6563b7f28 100644
--- a/src/index.js
+++ b/src/index.js
@@ -23,6 +23,7 @@ import "./components/split-axis-events";
 import "./components/networked-video-player";
 import "./components/offset-relative-to";
 import "./components/cached-gltf-model";
+import "./components/spawn-controller";
 import "./systems/personal-space-bubble";
 
 import registerNetworkScheams from "./network-schemas";
diff --git a/templates/room.hbs b/templates/room.hbs
index 9db46f2fd02ca944db2cab9f6226f7f4b6913a85..92b4d9250bb8c33a054792719f072d168b487fdc 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -119,6 +119,7 @@
                 personal-space-bubble
                 look-controls
                 networked="template: #head-template; showLocalTemplate: false;" 
+                spawn-controller="radius: 4"
             ></a-entity>
 
             <a-entity