D2 deliverable

Modify existing lexemes, add new rules to spec for conditionals,
while-loops, and others.