diff --git a/node/server/server.js b/node/server/server.js
index a60cdce..58e9da7 100644
--- a/node/server/server.js
+++ b/node/server/server.js
@@ -1,24 +1,68 @@
+// server/server.js
+
 const express = require('express');
 const http = require('http');
-const WebSocket = require('ws');
+const ws = require('ws');
 const path = require('path');
 const fs = require('fs');
 
-// --- App & HTTP-Server
+// --- Server Setup ---
 const app = express();
 const server = http.createServer(app);
-const wss = new WebSocket.Server({ server });
+const wss = new ws.Server({ server });
 
-// --- Static files aus /public
+// Statisches Hosting von /public
 app.use(express.static(path.join(__dirname, 'public')));
 
-// --- WebSocket: simple Broadcast Demo
-wss.on('connection', ws => {
-  ws.send(JSON.stringify({ type: 'spirit', data: { name: 'Demo', modelUrl: '/assets/models/spirits/Yuki_Onna.glb', desc: 'Testdesc.' } }));
+// --- Spirits laden ---
+const SPIRITS_PATH = path.join(__dirname, '..', 'spirits', 'spirit_list.json');
+let spirits = [];
+try {
+  spirits = JSON.parse(fs.readFileSync(SPIRITS_PATH, 'utf8'));
+  if (!Array.isArray(spirits) || spirits.length === 0) throw 'Spirit-Liste leer oder ungültig!';
+} catch (e) {
+  console.error('Fehler beim Laden der Spirits:', e);
+  process.exit(1);
+}
+
+// --- WebSocket Logik ---
+wss.on('connection', (socket) => {
+  console.log('Neuer Client verbunden');
+
+  // Sende sofort den aktuellen Spirit
+  if (typeof currentSpiritIndex === 'number') {
+    socket.send(JSON.stringify({
+      type: 'spirit',
+      data: spirits[currentSpiritIndex]
+    }));
+  }
 });
 
-// --- Server starten
+// --- Spirit-Zeitsteuerung ---
+let currentSpiritIndex = Math.floor(Math.random() * spirits.length);
+
+function pushSpiritToAllClients() {
+  const spirit = spirits[currentSpiritIndex];
+  const payload = JSON.stringify({ type: 'spirit', data: spirit });
+  wss.clients.forEach(client => {
+    if (client.readyState === ws.OPEN) {
+      client.send(payload);
+    }
+  });
+  console.log(`Spirit "${spirit.name}" wurde an alle Clients gepusht.`);
+}
+
+// --- Timer: Alle 12 Sekunden neues Spirit ---
+setInterval(() => {
+  currentSpiritIndex = Math.floor(Math.random() * spirits.length);
+  pushSpiritToAllClients();
+}, 12000);
+
+// Beim Start: Ersten Spirit pushen
+setTimeout(pushSpiritToAllClients, 1500);
+
+// --- Server Start ---
 const PORT = process.env.PORT || 3000;
 server.listen(PORT, () => {
-  console.log('Server läuft auf http://localhost:' + PORT);
+  console.log(`Server läuft auf http://localhost:${PORT}`);
 });
\ No newline at end of file