CVS after Ben merge - how is this *supposed* to work??