rpearce/grichards: Adding persistent storage
rpearce/grichards: Fixing failing tests