Expanded on the TokenStreams

I wanted to allow the buffer to fill as parsing, rather than all at
once, and to allow several variants of inputs.