More work on parser. Need to remove newlines.