Working on fixing bugs with modular storage