Working token authentication

Fixes #1
Fixes #2