CH6 - A final refactor