Add strain selection and reorganize.