Cleanup
Mend grammar
Annotations
Test for parse_delta