relationships framework completed remaining relationship views
Tested current user with pry - all working
Fixed merge conflicts