updated from adam's comments, still need to add pagination when kaminari is merged