DB Storage + test - WIP