5 pts
Storage refactor
Storage refactor #2