Working on reformationg to CVS