diff --git a/Cargo.lock b/Cargo.lock
index f868716..aa2f80e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,18 +8,179 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "cc"
+version = "1.0.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+
+[[package]]
+name = "clap"
+version = "4.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "is-terminal",
+ "once_cell",
+ "strsim",
+ "termcolor",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "numtoa"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 
+[[package]]
+name = "once_cell"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -42,9 +203,50 @@ dependencies = [
 name = "rhd"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "termion",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.36.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "termion"
 version = "2.0.1"
@@ -56,3 +258,103 @@ dependencies = [
  "redox_syscall",
  "redox_termios",
 ]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
diff --git a/Cargo.toml b/Cargo.toml
index 29b77c7..b249d7a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,4 +7,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+clap = { version = "4.0.29", features = ["derive"] }
 termion = "2.0.1"
diff --git a/src/main.rs b/src/main.rs
index ecb3139..efe6d91 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,65 +1,41 @@
+
+use std::fs::File;
+use std::io;
+
 mod colormap;
 
-use std::env;
-use std::fs::File;
-use std::io::{self, Read};
+mod tohex;
+use tohex::hexdump;
+mod tobin;
+use tobin::bindump;
 
-use colormap::{map_char_to_color, map_u8_to_color};
+use clap::Parser;
 
-const GLOBAL_BUFFER_LENGTH: usize = 16;
+#[derive(Parser)]
+#[command(version, about="A simple hexdump tool")]
+struct Arguments {
+    /// Revert a hexdump to binary
+    #[arg(short, long)]
+    revert: bool,
 
-fn dump_to_hex(bytes: &mut [u8]) -> String {
-    let out_vec: Vec<String> = bytes
-        .chunks(2)
-        .map(|c| {
-            if c.len() == 2 {
-                format!("{}{}", map_u8_to_color(c[0]), map_u8_to_color(c[1]))
-            } else {
-                map_u8_to_color(c[0])
-            }
-        })
-        .collect();
-    out_vec.join(" ")
-}
-
-fn dump_to_chr(bytes: &mut [u8]) -> String {
-    let out_vec: Vec<String> = bytes.iter().map(|ord| map_char_to_color(*ord)).collect();
-    out_vec.join("")
+    /// Filename to read, if left out read from stdin
+    filename: Option<String>,
 }
 
 fn main() {
-    let args: Vec<String> = env::args().collect();
+    let args = Arguments::parse();
 
-    let mut reader: Box<dyn io::Read> = if args.len() == 1 {
+    let reader: Box<dyn io::Read> = if args.filename.is_none() {
         Box::new(io::stdin())
     } else {
-        let filename = &args[1];
+        let filename = args.filename.unwrap();
         Box::new(File::open(filename).expect("Could not open file."))
     };
 
-    let mut buf = [0; GLOBAL_BUFFER_LENGTH];
-    let mut offset: usize = 0;
-
-    loop {
-        let bytes_read = reader.read(&mut buf);
-        match bytes_read {
-            Ok(num) => {
-                if num == 0 {
-                    break;
-                } else {
-                    println!(
-                        "{:08x}: {:40} {:10}",
-                        offset,
-                        dump_to_hex(&mut buf[0..num]),
-                        dump_to_chr(&mut buf[0..num])
-                    );
-                    offset += GLOBAL_BUFFER_LENGTH;
-                }
-            }
-            Err(e) => {
-                eprintln!("hd: {}", e);
-                break;
-            }
-        }
+    if !args.revert {
+        hexdump(reader);
+    } else {
+        let writer: Box<dyn io::Write> = Box::new(io::stdout());
+        bindump(reader, writer);
     }
 }
diff --git a/src/tobin.rs b/src/tobin.rs
new file mode 100644
index 0000000..6b814cf
--- /dev/null
+++ b/src/tobin.rs
@@ -0,0 +1,13 @@
+use std::io;
+
+pub fn bindump (mut reader: Box<dyn io::Read>, mut writer: Box<dyn io::Write>) {
+    let mut buffer = String::new();
+    match reader.read_to_string(&mut buffer) {
+        Ok(_) => {
+            println!("{}", buffer);
+        }
+        Err(e) => {
+            eprintln!("revert: {}", e);
+        }
+    }
+}
diff --git a/src/tohex.rs b/src/tohex.rs
new file mode 100644
index 0000000..cc3f06f
--- /dev/null
+++ b/src/tohex.rs
@@ -0,0 +1,53 @@
+use std::io;
+
+use super::colormap::{map_char_to_color, map_u8_to_color};
+
+const GLOBAL_BUFFER_LENGTH: usize = 16;
+
+fn dump_to_hex(bytes: &mut [u8]) -> String {
+    let out_vec: Vec<String> = bytes
+        .chunks(2)
+        .map(|c| {
+            if c.len() == 2 {
+                format!("{}{}", map_u8_to_color(c[0]), map_u8_to_color(c[1]))
+            } else {
+                map_u8_to_color(c[0])
+            }
+        })
+        .collect();
+    let padding_length = (8 - out_vec.len()) * 5;
+    format!("{:8}{}", out_vec.join(" "), " ".repeat(padding_length))
+}
+
+fn dump_to_chr(bytes: &mut [u8]) -> String {
+    let out_vec: Vec<String> = bytes.iter().map(|ord| map_char_to_color(*ord)).collect();
+    out_vec.join("")
+}
+
+pub fn hexdump(mut reader: Box<dyn io::Read>) {
+    let mut buf = [0; GLOBAL_BUFFER_LENGTH];
+    let mut offset: usize = 0;
+
+    loop {
+        let bytes_read = reader.read(&mut buf);
+        match bytes_read {
+            Ok(num) => {
+                if num == 0 {
+                    break;
+                } else {
+                    println!(
+                        "{:08x}: {:40}  {:10}",
+                        offset,
+                        dump_to_hex(&mut buf[0..num]),
+                        dump_to_chr(&mut buf[0..num])
+                    );
+                    offset += GLOBAL_BUFFER_LENGTH;
+                }
+            }
+            Err(e) => {
+                eprintln!("hd: {}", e);
+                break;
+            }
+        }
+    }
+}