This article presents an overview of research into computers and education undertaken at a the University of Pretoria since 1995. It seeks to explore the patterns that have emerged and to indicate potential directions for future research. In response to a call for research in the field to be taken seriously the article identifies the main themes that have been researched over fifteen years.The analysis shows that the main themes addressed are "Didactic/Pedagogical Issues and Teaching/Learning Strategies" and "Architectures for Educational Technology Systems". Finally the paper recommends the development of a taxonomy of terms to be used in the classification of research on e-Learning.