Forgot I was in the middle of a refactor