[In progress] Player refactoring