Working more on patients
Merge conflicts. ALL OF THEM