move storage access into its own class