More work on the relationships between entities. Some work on the various views.