Refactor how players are stored and rotated