Making progress of sorts.
Ok, yet more updates to the parser.