added in changes from mentor session Monday PM, find by and find by all moving from a .each to a .map