Added most of the matches, need to do STRING, EOF, and COMMENTS, maybe more