Changes to BNF
Adding lexer & parser experimental