Hacked together basic many-to-many support
Added TODO comment to document odd behaviour