diff --git a/src/messageHandler.js b/src/messageHandler.js
index 60954b7..b82e1aa 100644
--- a/src/messageHandler.js
+++ b/src/messageHandler.js
@@ -1,6 +1,7 @@
 'use strict';
 const configFile = require('./config.json');
 const inArray = require('in-array');
+const whitelist = require('../whitelist.json');
 
 module.exports = class MessageHandler {
   constructor(client) {
@@ -14,18 +15,20 @@ module.exports = class MessageHandler {
   }
 
   handleMessage(message) {
-    console.log('handledMessage got called with: ' + message);
-
-    // dont answer my own messages
-    if (message.author === this.client.user) {
+    if (!message.content.startsWith(configFile.messagePrefix)) {
       return;
     }
 
-    if (message.author.username === 'Risenx') {
+    console.log('handleMessage got called with: ' + message);
+
+    // dont answer my own messages
+    if (message.author === this.client.user) {
       return;
     }
 
-    if (!message.content.startsWith(configFile.messagePrefix)) {
+    // ignore message from people that are not in whitelist
+    // TODO: Rewrite this as a proper rights system
+    if (!inArray(whitelist, message.author.username)) {
       return;
     }
 
diff --git a/whitelist.json b/whitelist.json
new file mode 100644
index 0000000..825b471
--- /dev/null
+++ b/whitelist.json
@@ -0,0 +1,4 @@
+[
+  "Farami",
+  "slowChildPlaying"
+]
\ No newline at end of file