Addressing comments

I still need to do CR_template.pxi and CA_template.pxi