diff --git a/clippable-cli/src/main.rs b/clippable-cli/src/main.rs
index 4b11c86..5e6fd15 100644
--- a/clippable-cli/src/main.rs
+++ b/clippable-cli/src/main.rs
@@ -24,8 +24,18 @@ fn main() {
              .long("update-key")
              .value_name("NAME")
              .help("Generate a new key for that user identified by NAME"))
+        .arg(Arg::with_name("new-store")
+             .short("s")
+             .long("new-store")
+             .value_name("filename")
+             .help("Creates a new file store with the appropriatte structures"))
         .get_matches();
 
+    if let Some(filename) = matches.value_of("new-store") {
+        println!("Creating new store {}", filename);
+        create_new_store(filename.to_string());
+    }
+
     if let Some(name) = matches.value_of("generate-key") {
         println!("Genating key for {}", name);
         generate_key(String::from(name));
@@ -41,6 +51,14 @@ fn main() {
         update_key(String::from(name));
     }
 
+
+}
+
+fn create_new_store(filename: String) {
+    match DB::new_store(filename) {
+        Ok(_) => println!("Store created"),
+        Err(e) => eprintln!("Error: {}", e)
+    }
 }
 
 fn generate_key(name: String) {