WIP. Trying to get the storage going.