More work on settings integration.