#1 - Settings refactor