diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java
index ff9b9cc..2e3f22c 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@@ -3,7 +3,6 @@ package com.bbn.hadder.listener;
 import com.bbn.hadder.Rethink;
 import com.bbn.hadder.core.CommandHandler;
 import com.bbn.hadder.core.CommandParser;
-import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -21,8 +20,6 @@ public class CommandListener extends ListenerAdapter {
                 if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
                     CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
                 }
-            } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {
-                    event.getMessage().addReaction("🙅").queue();
             }
         }
     }
diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java
index 7da1d4f..abcb264 100644
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java
@@ -5,19 +5,40 @@ package com.bbn.hadder.listener;
  */
 
 import com.bbn.hadder.Rethink;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
+import java.time.Instant;
+
 public class GuildListener extends ListenerAdapter {
 
     public void onGuildJoin(GuildJoinEvent event) {
         Rethink.insertServer(event.getGuild().getId());
+        EmbedBuilder builder = new EmbedBuilder();
+        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder)
+                .setTitle("Joined Server").setThumbnail(event.getGuild().getIconUrl())
+                .addField("Name", event.getGuild().getName(), true)
+                .addField("Guild ID", event.getGuild().getId(), true)
+                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
+                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
+                .setTimestamp(Instant.now())
+                .build()).queue();
     }
 
     public void onGuildLeave(GuildLeaveEvent event) {
-
+        EmbedBuilder builder = new EmbedBuilder();
+        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder)
+                .setTitle("Left Server").setThumbnail(event.getGuild().getIconUrl())
+                .addField("Name", event.getGuild().getName(), true)
+                .addField("Guild ID", event.getGuild().getId(), true)
+                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
+                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
+                .setTimestamp(Instant.now())
+                .build()).queue();
     }
 
     public void onGuildMemberJoin(GuildMemberJoinEvent event) {