Add lexing of identifiers and if statements