- Continued implementing grammar functions