Pre-Generic Views

Up to the switch from custom to generic views.