[1520] Fix and massage after trying out bigger grammars
[1564] A sketchy framework to run over the whole Zoo & Tank