Fixed Patient not setting correctly. Maybe need a code refactor