Decoupled Storage Module

working so far