moving to abstracted storage