Massive refactoring
Started working on parsing of patient infos