parser appears to work
Closer, but still not right

Getting a commit point before I start again
closer, but 2 tests are still failing

Seems like a better grammar though