Some more work with grammar