Converted the whole framework over to including Phenotypes