Changed lexer, and added parser.