Feature/settings logic