Some good progress on the parsing being made here