continuing the refactor w/ lessons learned in implementing