Refactor: use marks not tokens
Introduce unplayed concept