Broken parser, better structure