Many improvements and working on local storage