Mainstreaming Vocabulary in Language Learning