need to rework lexer, current implementation flawed