First pass, settings grouping

Issue #1960