Newest version, with a bit more test code. Jons all set up now.