starting mayor refactor