Added most of the views for a first pass.