Fleshing out the grammar a little and adding some incredibly rudimentary 'unit tests' while working through some of the parsing issues.