catch up with commits for moving R and C to tapmatrix library