finish token stuff and now to write tests