For code review - don't merge

Think about using the render partial with collection approach here