CVS work in progress, debugging help appreciated