Teaching for Diversity