diff --git a/api/src/main/java/com/alttd/essentia/api/events/player/PlayerRandomTeleportEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerRandomTeleportEvent.java
new file mode 100644
index 0000000..57a842f
--- /dev/null
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerRandomTeleportEvent.java
@@ -0,0 +1,40 @@
+package com.alttd.essentia.api.events.player;
+
+import com.alttd.essentia.api.events.EssentiaEvent;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class PlayerRandomTeleportEvent extends EssentiaEvent {
+
+    private static final HandlerList handlerList = new HandlerList();
+
+    private final Player player;
+    private final Location location;
+
+    public PlayerRandomTeleportEvent(Player player, Location location) {
+        this.player = player;
+        this.location = location;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return handlerList;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlerList;
+    }
+
+}
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/argumement/OfflinePlayerCompletingArgument.java b/plugin/src/main/java/com/alttd/essentia/commands/argumement/OfflinePlayerCompletingArgument.java
index 5897a54..af47a17 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/argumement/OfflinePlayerCompletingArgument.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/argumement/OfflinePlayerCompletingArgument.java
@@ -8,7 +8,6 @@ import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import io.papermc.paper.command.brigadier.MessageComponentSerializer;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/BackCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/BackCommand.java
index ac9e5c2..4774586 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/BackCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/BackCommand.java
@@ -2,7 +2,7 @@ package com.alttd.essentia.commands.player;
 
 import com.alttd.essentia.EssentiaPlugin;
 import com.alttd.essentia.api.events.EssentiaEvent;
-import com.alttd.essentia.api.events.PlayerTeleportBackEvent;
+import com.alttd.essentia.api.events.player.PlayerTeleportBackEvent;
 import com.alttd.essentia.api.user.User;
 import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.configuration.Config;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/DeathBackCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/DeathBackCommand.java
index e65fdb6..928c137 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/DeathBackCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/DeathBackCommand.java
@@ -4,7 +4,7 @@ import com.alttd.essentia.EssentiaPlugin;
 import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.configuration.Config;
 import com.alttd.essentia.api.events.EssentiaEvent;
-import com.alttd.essentia.api.events.PlayerTeleportBackEvent;
+import com.alttd.essentia.api.events.player.PlayerTeleportBackEvent;
 import com.alttd.essentia.tasks.TeleportSounds;
 import com.alttd.essentia.api.user.User;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/DelHomeCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/DelHomeCommand.java
index b68a620..0dc2af2 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/DelHomeCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/DelHomeCommand.java
@@ -5,7 +5,7 @@ import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.commands.argumement.OfflinePlayerArgument;
 import com.alttd.essentia.configuration.Config;
 import com.alttd.essentia.api.events.EssentiaEvent;
-import com.alttd.essentia.api.events.PlayerRemoveHomeEvent;
+import com.alttd.essentia.api.events.player.PlayerRemoveHomeEvent;
 import com.alttd.essentia.api.user.User;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/HomeCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/HomeCommand.java
index bcf76c5..9ce11d2 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/HomeCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/HomeCommand.java
@@ -2,7 +2,7 @@ package com.alttd.essentia.commands.player;
 
 import com.alttd.essentia.EssentiaPlugin;
 import com.alttd.essentia.api.events.EssentiaEvent;
-import com.alttd.essentia.api.events.PlayerTeleportHomeEvent;
+import com.alttd.essentia.api.events.player.PlayerTeleportHomeEvent;
 import com.alttd.essentia.api.model.Home;
 import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.configuration.Config;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/SetHomeCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/SetHomeCommand.java
index ea94f50..be81f58 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/SetHomeCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/SetHomeCommand.java
@@ -2,7 +2,7 @@ package com.alttd.essentia.commands.player;
 
 import com.alttd.essentia.EssentiaPlugin;
 import com.alttd.essentia.api.events.EssentiaEvent;
-import com.alttd.essentia.api.events.PlayerSetHomeEvent;
+import com.alttd.essentia.api.events.player.PlayerSetHomeEvent;
 import com.alttd.essentia.api.user.User;
 import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.commands.argumement.OfflinePlayerArgument;
diff --git a/plugin/src/main/java/com/alttd/essentia/commands/player/SpawnCommand.java b/plugin/src/main/java/com/alttd/essentia/commands/player/SpawnCommand.java
index ea17c0b..e3859d9 100644
--- a/plugin/src/main/java/com/alttd/essentia/commands/player/SpawnCommand.java
+++ b/plugin/src/main/java/com/alttd/essentia/commands/player/SpawnCommand.java
@@ -1,7 +1,7 @@
 package com.alttd.essentia.commands.player;
 
 import com.alttd.essentia.EssentiaPlugin;
-import com.alttd.essentia.api.events.PlayerTeleportSpawnEvent;
+import com.alttd.essentia.api.events.player.PlayerTeleportSpawnEvent;
 import com.alttd.essentia.commands.EssentiaCommand;
 import com.alttd.essentia.configuration.Config;
 import com.alttd.essentia.api.events.EssentiaEvent;
diff --git a/plugin/src/main/java/com/alttd/essentia/feature/savedinventory/SavedInventoryListener.java b/plugin/src/main/java/com/alttd/essentia/feature/savedinventory/SavedInventoryListener.java
new file mode 100644
index 0000000..c2498ab
--- /dev/null
+++ b/plugin/src/main/java/com/alttd/essentia/feature/savedinventory/SavedInventoryListener.java
@@ -0,0 +1,27 @@
+package com.alttd.essentia.feature.savedinventory;
+
+import com.alttd.essentia.EssentiaPlugin;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+public class SavedInventoryListener implements Listener {
+
+    private final EssentiaPlugin plugin;
+
+    public SavedInventoryListener() {
+        this.plugin = EssentiaPlugin.instance();
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onPlayerDeath(PlayerDeathEvent event) {
+        // TODO -- add config value to save on death
+    }
+
+    @EventHandler()
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        // TODO -- add config value to save on leave
+    }
+
+}