Feature/settings

done