Journal: Move storage out to separate class/interface