Player refactor.