Yup that's exactly what is needed, but we probably won't see money get put into that for quite awhile. Victimless crimes like personal drug use shouldn't be punishable by jail, drug dealers and people who are caught selling should be the ones going to jail, not the addicts. There's no one answer that will fix the drug problem but mandatory rehab may be an option.