diff --git a/README.md b/README.md
index e9a82d6..787cf9a 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,23 @@
 
 ## Usage
 
+### Upload coredump
+
 ````
 $ export SENTRY_DSN=https://something@your-sentry-dsn/42
-$ upload_coredump /path/to/core /path/to/executable
+$ upload_coredump /path/to/core upload /path/to/executable
 ````
 
 OR
 
 ````
-$ upload_coredump /path/to/core /path/to/executable --sentry-dsn https://something@your-sentry-dsn/42
+$ upload_coredump --sentry-dsn https://something@your-sentry-dsn/42 /path/to/executable upload /path/to/core 
+````
+
+### Watch for coredumps
+
+````
+$ upload_coredump --sentry-dsn https://something@your-sentry-dsn/42 /path/to/executable watch /path/to/dir 
 ````
 
 ## Development
diff --git a/pyproject.toml b/pyproject.toml
index f2e6d57..b1ae6e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,7 @@ authors = ["Dominik Rindhauser <dominik.rindhauser@sentry.io>"]
 python = "^2.7"
 sentry-sdk = "^0.14.1"
 click = "^7.0"
+watchdog = "^0.8.2"
 
 [tool.poetry.dev-dependencies]
 pytest = "^4.6.9"
diff --git a/tests/test_basic.py b/tests/test_basic.py
index 104d215..2770f5a 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -6,13 +6,12 @@ from coredump_uploader import get_frame
 from coredump_uploader import Frame
 from coredump_uploader import get_image
 from coredump_uploader import Image
-from coredump_uploader import main
 from coredump_uploader import _frame_re
 from coredump_uploader import _image_re
 from coredump_uploader import Thread
 from coredump_uploader import Stacktrace
-from coredump_uploader import main
-from coredump_uploader import get_all_threads
+from coredump_uploader import get_threads
+from coredump_uploader import signal_name_to_signal_number
 
 
 def test_code_id_to_debug_id():
@@ -246,9 +245,9 @@ Thread 3 (Thread 0x5846 (LWP 40)):
             """
     ],
 )
-def test_get_all_threads(gdb_output):
-    thread_list, exit_signal, stacktrace, crashed_thread_id = get_all_threads(
-        gdb_output
+def test_get_threads(gdb_output):
+    thread_list, exit_signal, stacktrace, crashed_thread_id = get_threads(
+        gdb_output, True
     )
     assert exit_signal == "SIGSEGV"
     assert thread_list[2].to_json() == {