refactor stuff in prep for rjbs pairup