Data models woes and fixes. Finally got roster_for method working.