Rewriting settings as service. WIP
Merge remote-tracking branch 'origin/sasha' into sasha