Add generator, and finish up syntax of language