Mayor refactoring is nearly complete.