diff --git a/bump/__init__.py b/bump/__init__.py
index 7a74295..16d3c96 100644
--- a/bump/__init__.py
+++ b/bump/__init__.py
@@ -1,2 +1,3 @@
 from bump.bump import Bump
+import bump.cli as cli
 
diff --git a/bump/bump.py b/bump/bump.py
index b880746..36382f8 100644
--- a/bump/bump.py
+++ b/bump/bump.py
@@ -6,6 +6,7 @@ import requests
 import base64
 import re
 import os
+import typer
 from random_word import RandomWords
 
 SENDER_LENGTH = 4 
@@ -58,7 +59,6 @@ class Bump:
         if self.secrets == []:
             print("you seem to not have a secret in your secrets file! Creating one now...")
             self.generate_secret(secrets_file)
-            self.show_secret()
 
         self.URL = "https://bump.maenle.net/api/"
 
@@ -215,7 +215,3 @@ class Bump:
                     self._save_log(message)
                     log = self.load_log()
 
-
-
-if __name__ == '__main__':
-    b = Bump()
diff --git a/bump/cli.py b/bump/cli.py
new file mode 100644
index 0000000..7b90b10
--- /dev/null
+++ b/bump/cli.py
@@ -0,0 +1,23 @@
+import bump
+import typer
+
+cli = typer.Typer()
+
+@cli.command()
+def default(message = typer.Argument(None, help="The message to be bumped")):
+    bp = bump.Bump()
+    if message is None:
+        bp.show_secret()
+    else:
+        bp.push(message)
+
+@cli.command()
+def push():
+    bp = bump.Bump()
+    bp.version()
+
+def main():
+    typer.run(default)
+
+if __name__ == "__main__":
+    main()
diff --git a/setup.py b/setup.py
index 0d4a40f..5719074 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,15 @@
 from setuptools import setup
 
 setup(
+    entry_points={
+    'console_scripts': [
+        'bump = bump.cli:main',
+        ],
+    },
     name='bump_python',
     packages=['bump'],
     description='Notify your Phone from Python',
-    version='0.1.1',
+    version='0.1.3',
     url='https://git.maenle.tech/raphael/bump_python',
     author='Raphael Maenle',
     author_email='raphael@maenle.net',
@@ -18,6 +23,7 @@ setup(
         'qrcode',
         'pyyaml',
         'random-word',
-        'cryptography'
+        'cryptography',
+        'typer'
         ]
     )