Finished converting over grant and token handling