Final storage module prototype

Summary
Final storage module prototype