I think this is more correct...

I used a bunch of ManyToManyFields in last commit, and I'm pretty sure
that's wrong.