Testing with parser. Individual components revised, output still untested (with actual data).