Work on conditions...
Refactored token states.