[WIP] Starting work to fix drugs...