diff --git a/handlers/smtp.py b/handlers/smtp.py
index bf96b18..2863748 100644
--- a/handlers/smtp.py
+++ b/handlers/smtp.py
@@ -1,7 +1,7 @@
 from socketserver import StreamRequestHandler
 
 ERR_CODE = {
-            220 : ''
+            220 : '',
             500 : 'Syntax error, command unrecognized',
             }
 
diff --git a/mechs/smtp.py b/mechs/smtp.py
index e69de29..82548a0 100644
--- a/mechs/smtp.py
+++ b/mechs/smtp.py
@@ -0,0 +1,11 @@
+import socketserver
+from .. import handler.smtp as h_smtp
+
+class SmtpServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+    # Ctrl-C will cleanly kill all spawned threads
+    daemon_threads = True
+    # much faster rebinding
+    allow_reuse_address = True
+
+    def __init__(self, server_address, RequestHandlerClass):
+        socketserver.TCPServer.__init__(self, server_address, RequestHandlerClass)
\ No newline at end of file