More work in progress on the parser. Slowly taking shape