Right in the middle of massive refactoring.