diff --git a/bot/commands/Developer/restart.js b/bot/commands/Developer/restart.js
index 54d55dd..8b9bb8e 100644
--- a/bot/commands/Developer/restart.js
+++ b/bot/commands/Developer/restart.js
@@ -20,7 +20,7 @@ module.exports = class {
     }
 
     run (client, message, args, data) { //eslint-disable-line no-unused-vars
-        client.logger.success('RESTART', 'Restart command recieved. ' + exitQuotes.random());
+        client.logger.success('RESTART', 'Restart command received. ' + exitQuotes.random());
         client.disconnect();
         client.functions.wait();
         
diff --git a/bot/util/handlers/eventHandler.js b/bot/event_modules/eventHandler.js
similarity index 100%
rename from bot/util/handlers/eventHandler.js
rename to bot/event_modules/eventHandler.js
diff --git a/bot/util/handlers/messageHandler.js b/bot/event_modules/interactionCreate/messageHandler.js
similarity index 100%
rename from bot/util/handlers/messageHandler.js
rename to bot/event_modules/interactionCreate/messageHandler.js
diff --git a/bot/index.js b/bot/index.js
index 2df2429..56670d1 100644
--- a/bot/index.js
+++ b/bot/index.js
@@ -3,10 +3,10 @@
 const Discord = require('discord.js');
 const CommandLoader = require('./util/commandLoader');
 const EventLoader = require('./util/eventLoader');
-const EventHandler = require('./util/handlers/eventHandler');
-const MessageHandler = require('./util/handlers/messageHandler');
+const EventHandler = require('./event_modules/eventHandler');
+const MessageHandler = require('./event_modules/interactionCreate/messageHandler');
 const Functions = require('./util/functions');
-// const Database = require('./util/database');
+const Database = require('./util/database');
 const Logger = require('./util/logger');
 const sentry = require('@sentry/node');
 const config = require('../botconfig.json');
@@ -23,7 +23,7 @@ class WoomyClient extends Discord.Client {
         // Essential modules
         this.logger = Logger;
         this.MessageEmbed = Discord.MessageEmbed;
-        //this.db = new Database(this);
+        this.db = new Database(this);
         this.functions = new Functions(this);
         this.commandLoader = new CommandLoader(this);
         this.eventLoader = new EventLoader(this);
@@ -41,7 +41,8 @@ class WoomyClient extends Discord.Client {
     createEventListeners () {
         this.on('ready', this.runReadyModules);
         this.on('error', this.runErrorModules);
-        this.on('messageCreate', this.runMessageCreateModules);
+        this.on('interactionCreate', this.runInteractionModules);
+        /// this.on('messageCreate', this.runMessageCreateModules);
         this.on('guildCreate', this.runGuildCreateModules);
         this.on('guildDelete', this.runGuildDeleteModules);
         this.on('guildMemberAdd', this.runGuildMemberAddModules);
@@ -67,8 +68,11 @@ class WoomyClient extends Discord.Client {
         this.mainEventListener('error', error);
     }
 
+    runInteractionCreateModules (interaction) {
+        this.mainEventListener('interactionCreate', interaction);
+    }
+
     runMessageCreateModules (message) {
-        this.messageHandler.handle(message);
         this.mainEventListener('messageCreate', message);
     }
 
@@ -142,7 +146,7 @@ process.on('unhandledRejection', err => {
     client.logger.error('UNHANDLED_PROMISE_ERROR', err.stack);
 });
 
-// Shut down gracefully when SIGINT is recieved
+// Shut down gracefully when SIGINT is received
 process.on('SIGINT', () => {
     client.functions.shutdown();
 });
\ No newline at end of file
diff --git a/bot/util/dbvalidator.js b/bot/util/dbvalidator.js
deleted file mode 100644
index e69de29..0000000
diff --git a/bot/util/handlers/botListHandler.js b/bot/util/handlers/botListHandler.js
deleted file mode 100644
index e69de29..0000000
diff --git a/botconfig.json.example b/botconfig.json.example
index bcb6497..1fb7e72 100644
--- a/botconfig.json.example
+++ b/botconfig.json.example
@@ -18,7 +18,7 @@
         "database": "",
         "password": "",
         "port": 0000
-    }
+    },
 
     "emojis": {
         "success": "<:success:466995111885144095>",