[WIP] Use lexer 

Not sure if `$value` should be changed here. Is it expected to be changed?