Tokenizer update

Parser first implementation