Started reworking lexer & parser to make it more flexible.