- Adding the Storage part (MESSY code)