pidr 'teaching interface' is done, time to merge our work