Got token stuff working
Merge branch 'dev'