diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml
index 136025cf..12a2719a 100644
--- a/bin/domain/imag-todo/Cargo.toml
+++ b/bin/domain/imag-todo/Cargo.toml
@@ -35,3 +35,10 @@ version = "2.33.0"
 default-features = false
 features = ["color", "suggestions", "wrap_help"]
 
+[lib]
+name = "libimagtodofrontend"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-todo"
+path = "src/bin.rs"
diff --git a/bin/domain/imag-todo/src/bin.rs b/bin/domain/imag-todo/src/bin.rs
new file mode 100644
index 00000000..a2181dca
--- /dev/null
+++ b/bin/domain/imag-todo/src/bin.rs
@@ -0,0 +1,39 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; version
+// 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#![forbid(unsafe_code)]
+
+#![deny(
+    non_camel_case_types,
+    non_snake_case,
+    path_statements,
+    trivial_numeric_casts,
+    unstable_features,
+    unused_allocation,
+    unused_import_braces,
+    unused_imports,
+    unused_must_use,
+    unused_mut,
+    unused_qualifications,
+    while_true,
+)]
+
+#[macro_use] extern crate libimagrt;
+
+simple_imag_application_binary!(libimagtodofrontend, ImagTodo);
diff --git a/bin/domain/imag-todo/src/main.rs b/bin/domain/imag-todo/src/lib.rs
similarity index 81%
rename from bin/domain/imag-todo/src/main.rs
rename to bin/domain/imag-todo/src/lib.rs
index 36537ea9..16f42262 100644
--- a/bin/domain/imag-todo/src/main.rs
+++ b/bin/domain/imag-todo/src/lib.rs
@@ -41,7 +41,7 @@ extern crate toml_query;
 #[macro_use] extern crate is_match;
 extern crate failure;
 
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagerror;
 extern crate libimagtodo;
 
@@ -49,9 +49,11 @@ use std::process::{Command, Stdio};
 use std::io::stdin;
 use std::io::Write;
 use failure::Error;
+use failure::Fallible as Result;
+use clap::App;
 
 use libimagrt::runtime::Runtime;
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
 use libimagtodo::taskstore::TaskStore;
 use libimagerror::trace::{MapErrTrace, trace_error};
 use libimagerror::iter::TraceIterator;
@@ -60,29 +62,47 @@ use libimagerror::io::ToExitCode;
 
 mod ui;
 
-use crate::ui::build_ui;
-fn main() {
-    let version = make_imag_version!();
-    let rt = generate_runtime_setup("imag-todo",
-                                    &version,
-                                    "Interface with taskwarrior",
-                                    build_ui);
+/// Marker enum for implementing ImagApplication on
+///
+/// This is used by binaries crates to execute business logic
+/// or to build a CLI completion.
+pub enum ImagTodo {}
+impl ImagApplication for ImagTodo {
+    fn run(rt: Runtime) -> Result<()> {
+        match rt.cli().subcommand_name() {
+            Some("tw-hook") => tw_hook(&rt),
+            Some("list") => list(&rt),
+            Some(other) => {
+                debug!("Unknown command");
+                let _ = rt.handle_unknown_subcommand("imag-todo", other, rt.cli())
+                    .map_err_trace_exit_unwrap()
+                    .code()
+                    .map(::std::process::exit);
+            }
+            None => {
+                warn!("No command");
+            },
+        };
 
-    match rt.cli().subcommand_name() {
-        Some("tw-hook") => tw_hook(&rt),
-        Some("list") => list(&rt),
-        Some(other) => {
-            debug!("Unknown command");
-            let _ = rt.handle_unknown_subcommand("imag-todo", other, rt.cli())
-                .map_err_trace_exit_unwrap()
-                .code()
-                .map(::std::process::exit);
-        }
-        None => {
-            warn!("No command");
-        },
-    } // end match scmd
-} // end main
+        Ok(())
+    }
+
+    fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
+        ui::build_ui(app)
+    }
+
+    fn name() -> &'static str {
+        env!("CARGO_PKG_NAME")
+    }
+
+    fn description() -> &'static str {
+        "Interface with taskwarrior"
+    }
+
+    fn version() -> &'static str {
+        env!("CARGO_PKG_VERSION")
+    }
+}
 
 fn tw_hook(rt: &Runtime) {
     let subcmd = rt.cli().subcommand_matches("tw-hook").unwrap();