Refs #8. Adding stuff for CNCS geometry and making new one.