roles updated to use UserData

adding teams should work properly now.

company still isn't a field member, so that doesn't work