Move token code into it’s own controller