Migration from old style grammar.
Merge branch 'master' of https://github.com/MakerReduxCorp/MARDS