Move state to player. Fix queueing.