Start on the 3rd round of refactoring