Theoretical, untested finish of task 2. Parser now exists and awaits testing.
Tidied up some earlier misses
Merged Stage 1 tested with Stage 2 untested.