Beginnings of XP research #48.  Closes #54