JC: refecotring views. spec passes.