The refactor begins!
The refactor begins!