Token works, confirmed with comments

Token storage works, comments also working.