Change to Transitions and States, new PlayerHolder hasOption