New settings refactor - sigh