More updates to the settings classes.  Not there yet.