init-storage refactor wip