Continued with the refactor.