Added more stuff over weekend 7/12
Getting to GRTYPE subanalysis