#1 moved storage package from logic to model