- More refactoring
- first draft version of the persistance on disk