Use cid

This does the validation at the moment. Next step is publishing.