Add new hack for m2m tables
DONE!  Start testing...