Add variables to the lexer
Get variable parsing in place