Working on refactor.