Feature/views

For consideration.