Added more tokens. Should be near completion of the scanner.