7 Commits (feature/add-settings)