move token stream to Lexer module, misc fixes to  get basic parsing to work