Using Education Research to Develop Waves Courseware