Started implementation of rest of tokens, need to refactor