REFACTOR ALL THE THINGS!