Refactor w/ partials: progress