Addressing Diversity in the Classroom