diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java b/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
index 4432dba..5389a42 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
@@ -11,11 +11,8 @@ public class DiscordPlayer extends ChromaGamerBase {
 	}
 
 	public String getDiscordID() {
-		return did;
-	}
-
-	@Override
-	public String getFileName() {
+		if (did == null)
+			did = plugindata.getString(getFolder() + "_id");
 		return did;
 	}
 }
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index f531020..cf815b2 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -131,6 +131,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 			Bukkit.getPluginManager().registerEvents(new ExceptionListener(), this);
 			TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this);
 			TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class);
+			TBMCCoreAPI.RegisterUserClass(DiscordPlayer.class);
 			new Thread(() -> AnnouncementGetterThreadMethod()).start();
 			setupProviders();
 			TBMCCoreAPI.SendUnsentExceptions();
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
index 88a60e1..b7717d3 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
@@ -21,6 +21,8 @@ public class CommandListener {
 				final IChannel channel = event.getMessage().getChannel();
 				if (!channel.getID().equals(DiscordPlugin.botchannel.getID()) && !channel.isPrivate())
 					return;
+				if (channel.getID().equals(DiscordPlugin.chatchannel.getID()))
+					return; // The chat code already handles this - Right now while testing botchannel is the same as chatchannel
 				runCommand(event.getMessage(), true);
 			}
 		}, new IListener<MessageReceivedEvent>() {
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 83772c3..e5143bc 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -98,7 +98,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 				TBMCPlayer p = dp.getAs(TBMCPlayer.class);
 				if (!UnconnectedSenders.containsKey(author.getID()))
 					UnconnectedSenders.put(author.getID(), new DiscordSender(author, event.getMessage().getChannel(),
-							p == null ? null : p.getPlayerName())); // Display the playername, if found
+							p == null ? null : p.PlayerName().get())); // Display the playername, if found
 				dsender = UnconnectedSenders.get(author.getID());
 			}
 
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
index 96d2013..919b0e8 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
@@ -43,6 +43,9 @@ public class MCListener implements Listener {
 		if (DiscordPlugin.SafeMode)
 			return;
 		DiscordPlayer dp = e.getPlayer().getAs(DiscordPlayer.class);
+		/*System.out.println("dp: " + dp);
+		if (dp != null)
+			System.out.println("dp.did: " + dp.getDiscordID());*/
 		if (dp == null || dp.getDiscordID() == null || dp.getDiscordID() == "")
 			return;
 		IUser user = DiscordPlugin.dc.getUserByID(dp.getDiscordID());
@@ -73,8 +76,7 @@ public class MCListener implements Listener {
 		DiscordPlugin.Restart = !e.getCommand().equalsIgnoreCase("stop"); // The variable is always true except if stopped
 	}
 
-	/*@EventHandler
-	public void onPlayerMute(MuteStatusChangeEvent e) {
-		e.getAffected()
-	}*/
+	/*
+	 * @EventHandler public void onPlayerMute(MuteStatusChangeEvent e) { e.getAffected() }
+	 */
 }
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
index bc9377a..17dbcbf 100644
--- a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
@@ -46,7 +46,7 @@ public class AcceptMCCommand extends DiscordMCCommandBase {
 		}
 		DiscordPlayer dp = ChromaGamerBase.getUser(did, DiscordPlayer.class);
 		TBMCPlayer mcp = TBMCPlayerBase.getPlayer(((Player) sender).getUniqueId(), TBMCPlayer.class);
-		dp.connectWith(mcp); // TODO: Fix null.yml and empty playerinfos
+		dp.connectWith(mcp);
 		dp.save();
 		mcp.save();
 		ConnectCommand.WaitingToConnect.remove(sender.getName());