More progess into saving everything locally instead of using database