Move to json parser closes #3