Plunging back into views.

Hulk smash another 100 or so lines.