well that's quite the refactor