JC: Big changes and fixed bugs. Refectoring views. spec passes.
JC: fixed spec.