add tokens extraction
create token stuct