moved more junk into lexer, need to refactor for precedence/greediness