Interim checkin for expanded data model.

Finally got the relationship correct!