diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
index feb9395..d21ac17 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
@@ -71,6 +71,7 @@ public class FightSystem extends JavaPlugin {
         new InFightInventoryListener();
         new FreezeWorldStateListener();
         new EventJoinListener();
+        new EventRecordListener();
         new CheckListener();
         new TestListener();
         new NormalJoinListener();
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
new file mode 100644
index 0000000..720dbe0
--- /dev/null
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
@@ -0,0 +1,27 @@
+package de.steamwar.fightsystem.listener;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.fight.Fight;
+import de.steamwar.fightsystem.fight.FightPlayer;
+import de.steamwar.fightsystem.states.FightState;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import java.util.EnumSet;
+
+public class EventRecordListener extends BasicListener {
+
+    public EventRecordListener() {
+        super(Config.event() ? EnumSet.allOf(FightState.class) : EnumSet.noneOf(FightState.class));
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerJoin(PlayerJoinEvent e){
+        FightPlayer fp = Fight.getFightPlayer(e.getPlayer());
+        if(fp == null || !fp.isLiving())
+            return;
+
+        //TODO: Send Change
+    }
+}
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java
new file mode 100644
index 0000000..a373160
--- /dev/null
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java
@@ -0,0 +1,4 @@
+package de.steamwar.fightsystem.record;
+
+public class RecordSystem {
+}