[WIP] Storage reimplementation