Finished the walkthrough refactor.