I just changed 2000+ of code in JSword in something like 2 hours with zero introduced bugs (as measured by junit). It would be good if I could take credit for it, but Eclipse refactoring has to take it. The upshot is BookDataListener is no more, and everything uses OSIS/JAXB directly. I will continue to poke around for a while to check things out, but I'm mostly done. Joe.