All grammar rules working (closes #12)