diff --git a/mumbledj/mumbledj.rb b/mumbledj/mumbledj.rb
index bd1f210..6e2e6fc 100644
--- a/mumbledj/mumbledj.rb
+++ b/mumbledj/mumbledj.rb
@@ -1,7 +1,9 @@
 # MumbleDJ v2
 # By Matthieu Grieger
+# mumbledj.rb
 
 require "mumble-ruby"
+require_relative "config"
 
 # Class that defines MumbleDJ behavior.
 class MumbleDJ
@@ -51,10 +53,16 @@ class MumbleDJ
   # Sets various callbacks that can be triggered during the connection.
   def set_callbacks
     @client.on_text_message do |message|
-      # TODO: Call message parser here
+      self.parse_message(message)
     end
   end
   
+  # Parses messages looking for commands, and calls the appropriate
+  # methods to complete each requested command.
+  def parse_message(message)
+    
+  end
+  
   # Safely disconnects the bot from the server.
   def disconnect
     @client.disconnect
diff --git a/mumbledj/run_bot.rb b/mumbledj/run_bot.rb
index e79684f..c3c1f06 100644
--- a/mumbledj/run_bot.rb
+++ b/mumbledj/run_bot.rb
@@ -1,3 +1,7 @@
+# MumbleDJ
+# By Matthieu Grieger
+# run_bot.rb
+
 require_relative "mumbledj"
 require 'thread'