Further work on persisting the chosen settings to the database.