Interface Update

Major changes to interface (see token and token_stream structs). Not a
working build.