Work on the 3rd round of the refactor