New analysis code

Note inclusion of new subplot routine as well