Added more parameters and fixed some bugs
Finished grammar, debugging begins
Added copy of scala bnf to docs
Attempting to fix conlficts