first drafty version of adding CM