And if you care, here's the diff. Not ready for prime-time, I intend to change some stuff before I give it to Jan.