diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 5cf43e6..bde7d09 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -1,6 +1,8 @@
 package com.bbn.hadder;
 
 import com.bbn.hadder.commands.TestCommand;
+import com.bbn.hadder.commands.fun.GifCommand;
+import com.bbn.hadder.commands.general.PingCommand;
 import com.bbn.hadder.commands.moderation.BanCommand;
 import com.bbn.hadder.commands.moderation.KickCommand;
 import com.bbn.hadder.commands.owner.ShutdownCommand;
@@ -46,7 +48,7 @@ public class Hadder {
         builder.setToken(config.getString("Token"));
 
 
-        CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand()));
+        CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand()));
 
         builder.addEventListeners(
                 new MentionListener(),
diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
new file mode 100644
index 0000000..e9ae1a6
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
@@ -0,0 +1,59 @@
+package com.bbn.hadder.commands.fun;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Random;
+
+public class GifCommand implements Command {
+    @Override
+    public void executed(String[] args, MessageReceivedEvent event) {
+        String url;
+        JSONArray array;
+        String query = "";
+        for(String arg : args) {
+            query += arg.toLowerCase() + "+";
+            query = query.substring(0, query.length()-1);
+        }
+
+        File configfile = new File("./config.json");
+
+        JSONObject config = null;
+        try {
+            config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI()))));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        OkHttpClient caller = new OkHttpClient();
+        Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + config.getString("Giphy")).build();
+        try {
+            Random rand = new Random();
+            Response response = caller.newCall(request).execute();
+            JSONObject json = new JSONObject(response.body().string());
+            array = json.getJSONArray("data");
+            int gifIndex = rand.nextInt(array.length());
+            url = (String) array.getJSONObject(gifIndex).get("url");
+            event.getTextChannel().sendMessage(url).queue();
+        } catch (Exception e) {
+            event.getTextChannel().sendMessage("Meddl Bruder. Ich hab heut leider kein gif für dich").queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"gif"};
+    }
+}
diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java
new file mode 100644
index 0000000..d155efc
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java
@@ -0,0 +1,24 @@
+package com.bbn.hadder.commands.general;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
+public class PingCommand implements Command {
+
+    @Override
+    public void executed(String[] args, MessageReceivedEvent event) {
+        EmbedBuilder builder = new EmbedBuilder();
+        event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription("0").build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"ping"};
+    }
+}