A lot of the work on relationships
More work on the extended model and relationships
Fixed tests