Responding to student diversity: lessons from the margin