revisions to this pull request including making belongs_to? simpler and changing logic in the view and controller