refactor ALL the things.