More work done on parser
Yet more parsing