Changing the grammar a bit
Slight changes to the parser and lexer to reflect new grammar... still in progress