diff --git a/TODO.org b/TODO.org
index b8798b3..90c6633 100644
--- a/TODO.org
+++ b/TODO.org
@@ -2,6 +2,7 @@
 ** TODO Add a license
 ** TODO Better communication protocol
 ** TODO Add tests
+** TODO Readme
 * Coffer Server
 ** TODO Add secrets on-the-fly
 ** TODO Store secrets in secure memory
@@ -14,8 +15,10 @@
 ** TODO Send key requests encrypted/signed
 * Coffer Companion
 ** TODO Add Subcommands
-   - [ ] Generate master key
+   - [X] Generate master key
    - [ ] Generate client key
-   - [ ] Encrypt/Decrypt secrets with master key
-   - [ ] Encrypt/Decrypt key request with client key
+   - [X] Encrypt secrets with master key
+   - [ ] Decrypt secrets with master key
+   - [ ] Encrypt key request with client key
+   - [ ] Decrypt key request with client key
    - [ ] Generate trampolin sh from dockerfile
diff --git a/coffer-companion/src/main.rs b/coffer-companion/src/main.rs
index f3bd098..d38c3c4 100644
--- a/coffer-companion/src/main.rs
+++ b/coffer-companion/src/main.rs
@@ -1,6 +1,3 @@
-use std::error::Error;
-use std::fs::File;
-use std::io::Write;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -23,29 +20,11 @@ enum Args {
     }
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() {
     let args: Args = Args::from_args();
 
     match args {
         Args::Generate {out} => generate::generate_key(out),
         Args::Encrypt {yaml, out, masterkey} => encrypt::generate_encrypted_secrets(yaml, out, masterkey)
     }
-
-    let secreta = "ABC".to_owned();
-    let mut f = File::create("./keyreq_a.cbor")?;
-    let buf = serde_cbor::to_vec(&secreta)?;
-    f.write(&buf.len().to_be_bytes())?;
-    f.write(&buf)?;
-
-    let secretb = "XYZ".to_owned();
-    let mut f = File::create("./keyreq_b.cbor")?;
-    let buf = serde_cbor::to_vec(&secretb)?;
-    f.write(&buf.len().to_be_bytes())?;
-    f.write(&buf)?;
-
-    let secs = vec!["ABC", "XYZ"];
-    let f = File::create("./secreq.yaml")?;
-    serde_yaml::to_writer(f, &secs)?;
-
-    Ok(())
 }