See #18. Tests still failing. Working on Relationship code from Core Model.