More infrastructure and beginning of new views.