Add local storage & reformat