diff --git a/Pipfile b/Pipfile
index deae380..6e6fb51 100644
--- a/Pipfile
+++ b/Pipfile
@@ -8,6 +8,7 @@ responder = {editable = true, path = "."}
 uvicorn = "*"
 starlette = "*"
 aiofiles = "*"
+docopt = "*"
 
 [dev-packages]
 pytest = "*"
diff --git a/responder/__init__.py b/responder/__init__.py
index bb67a43..e69e735 100644
--- a/responder/__init__.py
+++ b/responder/__init__.py
@@ -1 +1,2 @@
 from .core import *
+from .cli import cli
diff --git a/responder/cli.py b/responder/cli.py
index e6f8407..475be3a 100644
--- a/responder/cli.py
+++ b/responder/cli.py
@@ -6,7 +6,7 @@ Usage:
 
 Options:
   -h --help     Show this screen.
-  --version     Show version.
+  -v --version     Show version.
   --speed=<kn>  Speed in knots [default: 10].
   --moored      Moored (anchored) mine.
   --drifting    Drifting mine.
@@ -15,3 +15,13 @@ Options:
 
 
 import docopt
+from .__version__ import __version__
+
+
+def cli():
+    arguments = docopt.docopt(__doc__, argv=None, help=True,
+                              version=__version__, options_first=False)
+    print(arguments)
+
+
+
diff --git a/setup.py b/setup.py
index f150d96..c24a012 100644
--- a/setup.py
+++ b/setup.py
@@ -114,9 +114,9 @@ setup(
     author_email="me@kennethreitz.org",
     url="https://github.com/kennethreitz/responder",
     packages=find_packages(exclude=["tests"]),
-    # entry_points={
-    #     "console_scripts": ["pipenv=pipenv:cli", "pipenv-resolver=pipenv.resolver:main"]
-    # },
+    entry_points={
+        "console_scripts": ["responder=responder:cli"]
+    },
     package_data={
         # "": ["LICENSE", "NOTICES"],
         #     "pipenv.vendor.requests": ["*.pem"],
diff --git a/tests/test_formats.py b/tests/test_formats.py
deleted file mode 100644
index e69de29..0000000