Tokens

Added security measure passing tokens around.