Kudos on extracting out the storage implementation. We should hopefully be able to write another storage implementation (to a database maybe) at some point using this extraction.