Adds rest of grammar, partly tuned to SDF

This is still heavily WIP