Did a bit more work to prove out the settings design.