Token join (3/24)

Token join