Lexer Finish and parser partially finish

Added some new tokens and added test for potential conflict with the
tokens.  The parser grammar has been added and need testing