Token management
issue 4