Fix formatting
Add persistence (Sqlite)