More work on models, views, populate

Change-Id: Ifa233890c4e454b4a386e8a07115680ff2d9e8c2