Added new JPs

Also committed to the JSON branch, but I decided I'm going to attempt to
mature the grammar without any JSON for easier debugging using
Antlrworks