Move some settings to Settings.
Rearrange for clarity.
Extract more settings.
Making some notes for later.