Adding some local storage :crystal_ball: