Worked on the parser some more.  Separated out keywords for easier matching.