Adding a bunch of work of splitting off the settings