changed whats returned from getToken again

started marking TODO sections with things we need to work on.