Worked on making the settings use classes