diff --git a/src/event/mod.rs b/src/event/mod.rs
index 70271ce..bb18cba 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -2,6 +2,7 @@ use {Message, Channel, User};
 
 use std::sync::Arc;
 
+#[derive(Debug)]
 pub enum Event {
     Message { message: Message },     // A user sends a message
 
@@ -12,6 +13,7 @@ pub enum Event {
     UserQuit { channel: Channel, user: User }  // A user quits a channel
 }
 
+#[derive(Debug)]
 pub struct Envelope {
     pub from: Option<String>,
     pub event: Event,
diff --git a/src/lib.rs b/src/lib.rs
index 748a032..f75deed 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -44,7 +44,7 @@ impl Tenquestionmarks {
         let tqm = Tenquestionmarks {
             modules: modules
         };
-        
+
         tqm
     }
 
@@ -128,6 +128,7 @@ impl Tenquestionmarks {
     }
 }
 
+#[derive(Debug)]
 pub struct Message {
     content: String,
     author: User,
@@ -143,6 +144,7 @@ impl Message {
     }
 }
 
+#[derive(Debug)]
 pub struct Channel {
     name: String,
     description: String,
@@ -156,6 +158,7 @@ impl Channel {
     }
 }
 
+#[derive(Debug)]
 pub struct User {
     name: String,
     sender: Box<MessageSender>
@@ -167,6 +170,6 @@ impl User {
     }
 }
 
-pub trait MessageSender : Sync + Send {
+pub trait MessageSender : Sync + Send + std::fmt::Debug {
     fn send_message (&self, _: &str) {}
 }
diff --git a/src/modules/discord.rs b/src/modules/discord.rs
index 74fb518..e91de70 100644
--- a/src/modules/discord.rs
+++ b/src/modules/discord.rs
@@ -13,6 +13,9 @@ use std::sync::Arc;
 use std::sync::mpsc::Receiver;
 use transformable_channels::mpsc::ExtSender;
 
+use std::fmt;
+use std::fmt::{Debug, Formatter};
+
 use {MessageSender, Message, User, Channel};
 
 pub struct DiscordModule {
@@ -58,6 +61,12 @@ impl MessageSender for DiscordMessageSender {
     }
 }
 
+impl Debug for DiscordMessageSender {
+    fn fmt (&self, formatter: &mut Formatter) -> fmt::Result {
+        write!(formatter, "DiscordMessageSender {{ channel_id: {:?} }}", self.channel_id)
+    }
+}
+
 impl EventLoop for DiscordModule {
     fn run (&self, sender: Box<ExtSender<event::Envelope>>, _: Receiver<Arc<event::Envelope>>) {
         let discord = Arc::new(Discord::from_bot_token(&self.token[..]).expect("Discord module: Login failed"));
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
index 0eedc24..fd4ae3e 100644
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -6,6 +6,7 @@ pub mod random;
 pub mod pvn;
 pub mod echobox;
 pub mod autolink;
+pub mod logger;
 
 pub mod loader;
 
diff --git a/src/modules/stdin.rs b/src/modules/stdin.rs
index 395d5a4..62cf906 100644
--- a/src/modules/stdin.rs
+++ b/src/modules/stdin.rs
@@ -13,6 +13,7 @@ use event::{Event, Envelope};
 
 pub struct StdinModule {}
 
+#[derive(Debug)]
 pub struct StdinMessageSender {
     name: String
 }