More storage wip