checked in save_m2m hack for review for #4