Started reworking WFF grammar