whoops, silly attempt at refactor