diff --git a/libimagstore/src/file_abstraction/stdio/mapper/json.rs b/libimagstore/src/file_abstraction/stdio/mapper/json.rs
new file mode 100644
index 00000000..9b300122
--- /dev/null
+++ b/libimagstore/src/file_abstraction/stdio/mapper/json.rs
@@ -0,0 +1,136 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015, 2016 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
+//
+
+use std::collections::HashMap;
+use std::io::Cursor;
+use std::io::{Read, Write};
+use std::path::PathBuf;
+
+use serde_json;
+use toml;
+
+use error::StoreErrorKind as SEK;
+use error::MapErrInto;
+use super::Mapper;
+use store::Result;
+
+use libimagerror::into::IntoError;
+
+#[derive(Deserialize, Serialize)]
+struct Entry {
+    header: serde_json::Value,
+    content: String,
+}
+
+impl Entry {
+
+    fn to_string(self) -> Result<String> {
+        toml::to_string(&self.header)
+            .map_err_into(SEK::IoError)
+            .map(|hdr| {
+                format!("---\n{header}---\n{content}",
+                        header  = hdr,
+                        content = self.content)
+            })
+    }
+
+}
+
+#[derive(Deserialize, Serialize)]
+struct Document {
+    version: String,
+    store: HashMap<PathBuf, Entry>,
+}
+
+pub struct JsonMapper;
+
+impl JsonMapper {
+
+    pub fn new() -> JsonMapper {
+        JsonMapper
+    }
+
+}
+
+impl Mapper for JsonMapper {
+    fn read_to_fs(&self, mut r: Box<Read>, hm: &mut HashMap<PathBuf, Cursor<Vec<u8>>>)   -> Result<()> {
+        let mut document = {
+            let mut s = String::new();
+            r.read_to_string(&mut s).expect("Reading failed");
+            let doc : Document = serde_json::from_str(&s).expect("Mapping error");
+            doc
+        };
+
+        let _ = try!(::semver::Version::parse(&document.version)
+            .map_err_into(SEK::VersionError)
+            .and_then(|doc_vers| {
+                // safe because cargo does not compile if crate version is not valid
+                let crate_version = ::semver::Version::parse(version!()).unwrap();
+
+                if doc_vers > crate_version {
+                    Err(SEK::VersionError.into_error())
+                } else {
+                    Ok(())
+                }
+            }));
+
+        for (key, val) in document.store.drain() {
+            let res = val
+                .to_string()
+                .map(|vals| hm.insert(key, Cursor::new(vals.into_bytes())))
+                .map(|_| ());
+
+            let _ = try!(res);
+        }
+
+        Ok(())
+    }
+
+    fn fs_to_write(&self, hm: &mut HashMap<PathBuf, Cursor<Vec<u8>>>, out: &mut Write) -> Result<()> {
+        #[derive(Serialize)]
+        struct OutDocument {
+            version: String,
+            store: HashMap<PathBuf, String>,
+        }
+
+        let mut doc = OutDocument {
+            version: String::from(version!()),
+            store:   HashMap::new(),
+        };
+
+        for (key, value) in hm.drain() {
+            let res = String::from_utf8(value.into_inner())
+                .map_err_into(SEK::IoError)
+                .map(|entrystr| {
+                    doc.store.insert(key, entrystr);
+                })
+                .map(|_| ());
+
+            let _ = try!(res);
+        }
+
+        serde_json::to_string(&doc)
+            .map_err_into(SEK::IoError)
+            .and_then(|json| out.write(&json.into_bytes()).map_err_into(SEK::IoError))
+            .and_then(|_| out.flush().map_err_into(SEK::IoError))
+            .map(|_| ())
+    }
+}
+
+
diff --git a/libimagstore/src/file_abstraction/stdio/mapper/mod.rs b/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
index cdc40121..bd4b62df 100644
--- a/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
+++ b/libimagstore/src/file_abstraction/stdio/mapper/mod.rs
@@ -28,3 +28,5 @@ pub trait Mapper {
     fn fs_to_write(&self, &mut HashMap<PathBuf, Cursor<Vec<u8>>>, &mut Write) -> Result<()>;
 }
 
+pub mod json;
+