Merged working version. Only doctors list functional