Patient builder- merged down into develop

Someone with more familiarity with the work going on in develop should check this out before merging into develop