More work in parser. Untested.