Test/Fix caching
Parser testing
better rendering of token blocks
Parser Stuff
Wooot, more parsing stuff