Some

quick debugging. Just one small error left over from refactoring. None
of this really needs class methods, so in removing that I broke a thing
or two.