merger + nearly finished add patient interface