diff --git a/src/commandmanagerspec.md b/src/CMDManagerSpec.md
similarity index 100%
rename from src/commandmanagerspec.md
rename to src/CMDManagerSpec.md
diff --git a/src/commandmanager.js b/src/commandmanager.js
new file mode 100644
index 0000000..8af950f
--- /dev/null
+++ b/src/commandmanager.js
@@ -0,0 +1,10 @@
+
+export class CommandLoader {
+    static async load() {
+
+    }
+
+    static async reload() {
+
+    }
+}
diff --git a/src/events.js b/src/events.js
index 704a695..6a63438 100644
--- a/src/events.js
+++ b/src/events.js
@@ -1,45 +1,45 @@
 import {Logger} from './logger';
 import {Config} from './config';
 import {RateLimits} from './ratelimits'
+import {MessageManager} from './messagemanager';
 
-export class Events extends RateLimits { // extends rate limits
+export class Events extends RateLimits {
     constructor() {
         super();
     }
 
     async init(client) {
-        this.client = client;
-        this.client.login(Config.Token);
+        this._client = client;
+        this._client.login(Config.Token);
     }
 
     get Client() {return this.client;}
 
     async handleEvents() {
-        this.client.on('ready', async () => {
+        this._client.on('ready', async () => {
             this.handle(undefined, 
                 [this.handleReady],
-                this.client
+                this._client
             );
         });
 
-        this.client.on('error', async (err) => {
+        this._client.on('error', async (err) => {
             this.handle(err,
                 [this.handleError],
-                this.client
+                this._client
             );
         });
 
-        this.client.on('message', async (message) => {
+        this._client.on('message', async (message) => {
             this.handle(message, 
-                [super.request, this.handleMessage],
-                this.client
+                [super.request, MessageManager.handleMessage],
+                this._client
             );
         });
     }
 
 
 
-
     async handle(obj = [null], callbacks = [undefined], client) {
         let doNext = false;
         if (callbacks.length == 0) {
@@ -70,10 +70,4 @@ export class Events extends RateLimits { // extends rate limits
         Logger.error(`An error occured with the Discord API: ${err}`);
         next();
     }
-
-    async handleMessage(message, client, next) {
-        if (client.user.id == message.author.id) return;
-        if (message.limiting) message.channel.send(`${message.author} You are being rate limited`);
-        next();
-    }
 }
diff --git a/src/guildmanager.js b/src/guildmanager.js
index 26f7846..dbea12f 100644
--- a/src/guildmanager.js
+++ b/src/guildmanager.js
@@ -4,6 +4,4 @@ export class GuildManager {
     constructor() {
 
     }
-
-    
 }
diff --git a/src/logger.js b/src/logger.js
index 7b2068d..a11840a 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -5,7 +5,7 @@ import fs from 'fs';
 let LogLevel = 1;
 let Dialect = 'SQLITE';
 let logPath = 'logs.log';
-let dateFormat = 'DD-MM-YY HH:MM:ss'
+let dateFormat = 'DD-MM-YY HH:mm:ss'
 
 export class Logger {
     static init(path) {
diff --git a/src/messagemanager.js b/src/messagemanager.js
index a5ae72f..3836ca3 100644
--- a/src/messagemanager.js
+++ b/src/messagemanager.js
@@ -1,5 +1,13 @@
 import {Logger} from './logger';
 
 export class MessageManager {
-    
+    static async init() {
+        
+    }
+
+    static async handleMessage(message, client, next) {
+        if (client.user.id == message.author.id) return;        
+        if (message.limiting) message.channel.send(`${message.author} You are being rate limited`);
+        next();
+    }
 }