In the middle of a massive refactor