v2
 - reformatting
 - encrypting/decrypting
 - TODO rejig paths