Part 3 working. Now to refactor with partials