More progress - no longer dependent on my local mutant version of Tutor\!