Teaching With Diversity In Mind