stuff from old cv added so this  closes #2