old and new cvs goodies needing merging