Updating for new settings method
Maiking things a bit nicer and creating a todo list!
Merge branch 'feature/Mail_Class' into develop