Alex's Commit |Patient Location almost there