I did a lot of work over the break and I've been pushing forward with it today too. I think all that remains is the moleebo: and molebba: prefixes. I'm still validating against tei_all; it's worth considering whether we should develop a customization of our own customization for the expanded files to use.