Feature/add settings