Working Settings

Got the Settings working properly