New Proposed changes for drug editing

Do not merge without speaking to JULIE