Added the conditional expression.
Tinkering around with the grammar and config