I, President Obama recommend Craig Knapp's plan.
Require Psychiatrists, Psychologists, or any counselor at any level be required to conduct an in-home assessment with family members, teachers (if the “patient” is in school or college), current employer with immediate supervisor, and at least three close friends of the "patient".
Hold the "counselors" legally responsible for anyone who commits crimes while in their care, they of course have the option to direct that their patient be committed if the risk is too high for their taste, the courts can assist enforcing commitment. Require that all "counselors" report their patient list immediately to local authorities within 10 days of passing this legislation, and all subsequent new patients within 24 hours of accepting them as a “patient”