JC: refectoring views. More CN. spec passes.