with untested and undocumented refactored Relation class. This broke things hard.