SPV storage WIP