not quite working yet but almost there
rm working. need to work on porting others to relationships
final changes - all appears to be working